Merge pull request #1 from adjust/v4120

Version 4.12.0

.gitmodules

@@ -1,8 +1,8 @@
 [submodule "ext/iOS/sdk"]
 	path = ext/iOS/sdk
-	url = [email protected]:adjust/ios_sdk.git
-	branch = cordova
+	url = [email protected]:adjust/ios_sdk_dev.git
+	branch = master
 [submodule "ext/Android/sdk"]
 	path = ext/Android/sdk
-	url = [email protected]:adjust/android_sdk.git
-	branch = cordova
+	url = [email protected]:adjust/android_sdk_dev.git
+	branch = master

CHANGELOG.md

@@ -1,3 +1,23 @@
+### Version 4.12.0 (29th December 2017)
+#### Native changes:
+- **[iOS]** https://github.com/adjust/ios_sdk/blob/master/CHANGELOG.md#version-4120-13th-december-2017
+- **[iOS]** https://github.com/adjust/ios_sdk/blob/master/CHANGELOG.md#version-4121-13th-december-2017
+- **[AND]** https://github.com/adjust/android_sdk/blob/master/CHANGELOG.md#version-4120-13th-december-2017
+
+#### Added
+- **[AND]** Added `getAmazonAdId` method to `Adjust` interface.
+- **[iOS][AND]** Added `setAppSecret` method to `AdjustConfig` interface.
+- **[iOS][AND]** Added `setReadMobileEquipmentIdentity` method to `AdjustConfig` interface.
+
+#### Fixed
+- **[AND]** Fixed handling of `null` value being passed as a currency to `setRevenue` method.
+
+#### Native SDKs
+- **[iOS]** [[email protected]][ios_sdk_v4.12.1]
+- **[AND]** [[email protected]][android_sdk_v4.12.0]
+
+---
+
 ### Version 4.11.3 (28th September 2017)
 #### Added
 - **[iOS]** Improved iOS 11 support.
@@ -282,6 +302,7 @@
 [ios_sdk_v4.11.3]: https://github.com/adjust/ios_sdk/tree/v4.11.3
 [ios_sdk_v4.11.4]: https://github.com/adjust/ios_sdk/tree/v4.11.4
 [ios_sdk_v4.11.5]: https://github.com/adjust/ios_sdk/tree/v4.11.5
+[ios_sdk_v4.12.1]: https://github.com/adjust/ios_sdk/tree/v4.12.1
 
 [android_sdk_v3.5.0]: https://github.com/adjust/android_sdk/tree/v3.5.0
 [android_sdk_v4.1.0]: https://github.com/adjust/android_sdk/tree/v4.1.0
@@ -294,3 +315,4 @@
 [android_sdk_v4.11.1]: https://github.com/adjust/android_sdk/tree/v4.11.1
 [android_sdk_v4.11.3]: https://github.com/adjust/android_sdk/tree/v4.11.3
 [android_sdk_v4.11.4]: https://github.com/adjust/android_sdk/tree/v4.11.4
+[android_sdk_v4.12.0]: https://github.com/adjust/android_sdk/tree/v4.12.0

VERSION

@@ -1 +1 @@
-4.11.3
+4.12.0

doc/migrate.md

@@ -1,4 +1,4 @@
-## Migrate your adjust SDK for Cordova to 4.11.3 from 3.4.1
+## Migrate your adjust SDK for Cordova to 4.12.0 from 3.4.1
 
 ### Migration procedure
 

example/config.xml

@@ -1,10 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.adjust.examples" version="4.11.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-    <name>adjust-example-app</name>
+<widget id="com.adjust.examples" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+    <name>HelloCordova</name>
     <description>
+        A sample Apache Cordova application that responds to the deviceready event.
     </description>
+    <author email="[email protected]" href="http://cordova.io">
+        Apache Cordova Team
+    </author>
     <content src="index.html" />
-    <plugin name="cordova-plugin-whitelist" spec="1" />
     <access origin="*" />
     <allow-intent href="http://*/*" />
     <allow-intent href="https://*/*" />
@@ -19,8 +22,4 @@
         <allow-intent href="itms:*" />
         <allow-intent href="itms-apps:*" />
     </platform>
-    <engine name="android" spec="~5.2.2" />
-    <universal-links>
-        <host name="f6wc.adj.st" scheme="https" event="adjustDeepLinking" />
-    </universal-links>
 </widget>

example/package.json

@@ -0,0 +1,10 @@
+{
+    "name": "com.adjust.examples",
+    "version": "1.0.0",
+    "displayName": "HelloCordova",
+    "cordova": {
+        "platforms": [],
+        "plugins": {}
+    },
+    "dependencies": {}
+}

example/plugins/com.adjust.sdk.purchase/CHANGELOG.md

@@ -0,0 +1,16 @@
+### Version 1.0.0 (10th August 2016)
+#### Added
+- Added product ID to the iOS verification request.
+
+#### Changed
+- Updated docs.
+- Updated native iOS purchase SDK version is **1.0.0**.
+- Updated native Android purchase SDK version is **1.1.2**.
+
+---
+
+### Version 0.1.1 (19th May 2016)
+#### Added
+- Initial release of the adjust purchase SDK for Cordova.
+- Native iOS purchase SDK version is **0.2.1**.
+- Native Android purchase SDK version is **1.1.1**.