Merge pull request #22 from adjust/v4113

Version 4.11.3
adjust · Sep 28, 2017 · f9c58f1 · f9c58f1
2 parents a89e844 + 80a0259
commit f9c58f1
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 14 deletions.
diff --git a/Adjust/AdjustConfig2dx.cpp b/Adjust/AdjustConfig2dx.cpp
@@ -96,7 +96,7 @@ static int fileReadCallback(const char* fileName, int* size) {
 #endif
 
 void AdjustConfig2dx::initConfig(std::string appToken, std::string environment, bool allowSuppressLogLevel) {
-    std::string sdkPrefix = "cocos2d-x4.11.2";
+    std::string sdkPrefix = "cocos2d-x4.11.3";
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
     cocos2d::JniMethodInfo miInit;

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,15 +1,30 @@
+### Version 4.11.3 (28th September 2017)
+#### Added
+- **[iOS]** Improved iOS 11 support.
+
+#### Changed
+- **[iOS]** Removed iOS connection validity checks.
+- **[iOS]** Updated native iOS SDK to version **4.11.5**.
+
+#### Native SDKs
+- **[iOS]** [iOS SDK 4.11.5][ios_sdk_v4.11.5]
+- **[AND]** [Android SDK 4.11.4][android_sdk_v4.11.4]
+- **[WIN]** [Windows SDK 4.0.3][windows_sdk_v4.0.3]
+
+ ---
+
 ### Version 4.11.2 (19th May 2017)
 #### Added
-- **[IOS][AND]** Added check if `sdk_click` package response contains attribution information.
-- **[IOS][AND]** Added sending of attributable parameters with every `sdk_click` package.
+- **[iOS][AND]** Added check if `sdk_click` package response contains attribution information.
+- **[iOS][AND]** Added sending of attributable parameters with every `sdk_click` package.
 
 #### Changed
-- **[IOS][AND]** Replaced `assert` level logs with `warn` level.
+- **[iOS][AND]** Replaced `assert` level logs with `warn` level.
 
 #### Native SDKs
 - **[iOS]** [iOS SDK 4.11.4][ios_sdk_v4.11.4]
 - **[AND]** [Android SDK 4.11.4][android_sdk_v4.11.4]
-- **[WIN]** [Windows@4.0.3][windows_sdk_v4.0.3]
+- **[WIN]** [Windows SDK 4.0.3][windows_sdk_v4.0.3]
 
 ---
 
@@ -37,7 +52,7 @@
 #### Native SDKs
 - **[iOS]** [iOS SDK 4.11.3][ios_sdk_v4.11.3]
 - **[AND]** [Android SDK 4.11.3][android_sdk_v4.11.3]
-- **[WIN]** [Windows@4.0.3][windows_sdk_v4.0.3]
+- **[WIN]** [Windows SDK 4.0.3][windows_sdk_v4.0.3]
 
 ---
 
@@ -67,7 +82,7 @@
 #### Native SDKs
 - **[iOS]** [iOS SDK 4.11.0][ios_sdk_v4.11.0]
 - **[AND]** [Android SDK 4.11.0][android_sdk_v4.11.0]
-- **[WIN]** [Windows@4.0.3][windows_sdk_v4.0.3]
+- **[WIN]** [Windows SDK 4.0.3][windows_sdk_v4.0.3]
 
 ---
 
@@ -172,6 +187,7 @@
 [ios_sdk_v4.11.0]: https://github.com/adjust/ios_sdk/tree/v4.11.0
 [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
 
 [android_sdk_v4.0.8]: https://github.com/adjust/android_sdk/tree/v4.0.8
 [android_sdk_v4.1.0]: https://github.com/adjust/android_sdk/tree/v4.1.0

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.11.2
+4.11.3
diff --git a/Windows/AdjustUAP10WinRT/AdjustUAP10WinRT/WRTAdjustConfig.cs b/Windows/AdjustUAP10WinRT/AdjustUAP10WinRT/WRTAdjustConfig.cs
@@ -52,7 +52,7 @@ public WRTAdjustConfig(string appToken, string environment)
         {
             this.appToken = appToken;
             this.environment = environment;
-            this.sdkPrefix = "cocos2d-x4.11.2";
+            this.sdkPrefix = "cocos2d-x4.11.3";
 
             this.logLevel = LogLevel.Info;
 

diff --git a/Windows/AdjustWP81WinRT/AdjustWP81WinRT/WRTAdjustConfig.cs b/Windows/AdjustWP81WinRT/AdjustWP81WinRT/WRTAdjustConfig.cs
@@ -52,7 +52,7 @@ public WRTAdjustConfig(string appToken, string environment)
         {
             this.appToken = appToken;
             this.environment = environment;
-            this.sdkPrefix = "cocos2d-x4.11.2";
+            this.sdkPrefix = "cocos2d-x4.11.3";
 
             this.logLevel = LogLevel.Info;
 

diff --git a/Windows/AdjustWS81WinRT/AdjustWS81WinRT/WRTAdjustConfig.cs b/Windows/AdjustWS81WinRT/AdjustWS81WinRT/WRTAdjustConfig.cs
@@ -52,7 +52,7 @@ public WRTAdjustConfig(string appToken, string environment)
         {
             this.appToken = appToken;
             this.environment = environment;
-            this.sdkPrefix = "cocos2d-x4.11.2";
+            this.sdkPrefix = "cocos2d-x4.11.3";
 
             this.logLevel = LogLevel.Info;
 

diff --git a/doc/migrate.md b/doc/migrate.md
@@ -1,4 +1,4 @@
-## Migrate your adjust SDK for Cocos2d-x to 4.11.2 from 4.0.x
+## Migrate your adjust SDK for Cocos2d-x to 4.11.3 from 4.0.x
 
 ### SDK initialization
 

diff --git a/ext/iOS/sdk b/ext/iOS/sdk
diff --git a/iOS/AdjustSdk.framework/Versions/A/AdjustSdk b/iOS/AdjustSdk.framework/Versions/A/AdjustSdk
diff --git a/iOS/AdjustSdk.framework/Versions/A/Headers/Adjust.h b/iOS/AdjustSdk.framework/Versions/A/Headers/Adjust.h
@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust
 //
-//  V4.11.4
+//  V4.11.5
 //  Created by Christian Wellenbrock on 2012-07-23.
 //  Copyright (c) 2012-2014 adjust GmbH. All rights reserved.
 //
+2 −2		Adjust.podspec
+0 −24		Adjust.xcodeproj/project.pbxproj
+27 −65		Adjust/ADJActivityState.m
+0 −19		Adjust/ADJConnectionValidator.h
+0 −88		Adjust/ADJConnectionValidator.m
+2 −2		Adjust/ADJKeychain.h
+36 −40		Adjust/ADJKeychain.m
+0 −3		Adjust/ADJPackageBuilder.m
+0 −18		Adjust/ADJRequestHandler.m
+0 −2		Adjust/ADJResponseData.h
+0 −1		Adjust/ADJResponseData.m
+2 −28		Adjust/ADJUtil.m
+1 −1		Adjust/Adjust.h
+1 −3		AdjustBridge/WebViewJavascriptBridge/WKWebViewJavascriptBridge.m
+1 −1		AdjustBridge/adjust_config.js
+1 −1		AdjustTests/ADJPackageFields.m
+9 −0		CHANGELOG.md
+7 −3		README.md
+1 −1		VERSION
+27 −0		doc/english/batch.md
+1 −1		doc/english/migrate.md
+1 −1		doc/japanese/migrate_ja.md
+1 −1		doc/migrate.md
+0 −6		examples/AdjustExample-Swift/AdjustExample-Swift.xcodeproj/project.pbxproj
+0 −6		examples/AdjustExample-WebView/AdjustExample-WebView.xcodeproj/project.pbxproj
+5 −0		examples/AdjustExample-WebView/AdjustExample-WebView/Assets.xcassets/AppIcon.appiconset/Contents.json
+0 −12		examples/AdjustExample-iOS/AdjustExample-iOS.xcodeproj/project.pbxproj
+38 −48		examples/AdjustExample-iOS/AdjustExample-iOS/Base.lproj/Main.storyboard
+0 −17		examples/AdjustExample-iOS/AdjustExample-iOS/URLRequest.h
+0 −71		examples/AdjustExample-iOS/AdjustExample-iOS/URLRequest.m
+0 −35		examples/AdjustExample-iOS/AdjustExample-iOS/ViewControlleriOS.m
+0 −6		examples/AdjustExample-iWatch/AdjustExample-iWatch.xcodeproj/project.pbxproj
+0 −12		examples/AdjustExample-tvOS/AdjustExample-tvOS.xcodeproj/project.pbxproj
+7 −1		.../AdjustExample-tvOS/AdjustExample-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json
+12 −0		...ple-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image Wide.imageset/Contents.json
+31 −45		examples/AdjustExample-tvOS/AdjustExample-tvOS/Base.lproj/Main.storyboard
+0 −17		examples/AdjustExample-tvOS/AdjustExample-tvOS/URLRequest.h
+0 −71		examples/AdjustExample-tvOS/AdjustExample-tvOS/URLRequest.m
+0 −38		examples/AdjustExample-tvOS/AdjustExample-tvOS/ViewControllertvOS.m