Merge pull request #20 from adjust/v4112

Version 4.11.2
adjust · May 19, 2017 · a89e844 · a89e844
2 parents 9a2bf15 + e2ecce7
commit a89e844
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 10 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.1";
+    std::string sdkPrefix = "cocos2d-x4.11.2";
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
     cocos2d::JniMethodInfo miInit;

diff --git a/Android/adjust-android.jar b/Android/adjust-android.jar
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+### 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.
+
+#### Changed
+- **[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]** [[email protected]][windows_sdk_v4.0.3]
+
+---
+
 ### Version 4.11.1 (27th April 2017)
 #### Added
 - **[iOS]** Added nullability annotations to public headers for Swift 3.0 compatibility.
@@ -156,6 +171,7 @@
 [ios_sdk_v4.10.2]: https://github.com/adjust/ios_sdk/tree/v4.10.2
 [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
 
 [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
@@ -165,5 +181,6 @@
 [android_sdk_v4.11.0]: https://github.com/adjust/android_sdk/tree/v4.11.0
 [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
 
 [windows_sdk_v4.0.3]: https://github.com/adjust/windows_sdk/tree/v4.0.3
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.11.1
+4.11.2
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.1";
+            this.sdkPrefix = "cocos2d-x4.11.2";
 
             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.1";
+            this.sdkPrefix = "cocos2d-x4.11.2";
 
             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.1";
+            this.sdkPrefix = "cocos2d-x4.11.2";
 
             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.1 from 4.0.x
+## Migrate your adjust SDK for Cocos2d-x to 4.11.2 from 4.0.x
 
 ### SDK initialization
 

diff --git a/ext/Android/sdk b/ext/Android/sdk
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/ADJLogger.h b/iOS/AdjustSdk.framework/Versions/A/Headers/ADJLogger.h
@@ -27,7 +27,7 @@ typedef enum {
  *
  * @param logLevel Level of the logs to be displayed.
  */
-- (void)setLogLevel:(ADJLogLevel)logLevel;
+- (void)setLogLevel:(ADJLogLevel)logLevel isProductionEnvironment:(BOOL)isProductionEnvironment;
 
 /**
  * @brief Prevent log level changes.
@@ -53,6 +53,7 @@ typedef enum {
  * @brief Print warn logs.
  */
 - (void)warn:(nonnull NSString *)message, ...;
+- (void)warnInProduction:(nonnull NSString *)message, ...;
 
 /**
  * @brief Print error logs.

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.3
+//  V4.11.4
 //  Created by Christian Wellenbrock on 2012-07-23.
 //  Copyright (c) 2012-2014 adjust GmbH. All rights reserved.
 //
+2 −2		Adjust/adjust/build.gradle
+49 −6		Adjust/adjust/src/main/java/com/adjust/sdk/ActivityHandler.java
+8 −24		Adjust/adjust/src/main/java/com/adjust/sdk/AdjustConfig.java
+3 −3		Adjust/adjust/src/main/java/com/adjust/sdk/AdjustFactory.java
+21 −0		Adjust/adjust/src/main/java/com/adjust/sdk/AttributionHandler.java
+1 −1		Adjust/adjust/src/main/java/com/adjust/sdk/Constants.java
+2 −0		Adjust/adjust/src/main/java/com/adjust/sdk/IActivityHandler.java
+3 −1		Adjust/adjust/src/main/java/com/adjust/sdk/IAttributionHandler.java
+3 −2		Adjust/adjust/src/main/java/com/adjust/sdk/ILogger.java
+1 −1		Adjust/adjust/src/main/java/com/adjust/sdk/ISdkClickHandler.java
+37 −4		Adjust/adjust/src/main/java/com/adjust/sdk/Logger.java
+21 −9		Adjust/adjust/src/main/java/com/adjust/sdk/PackageBuilder.java
+3 −0		Adjust/adjust/src/main/java/com/adjust/sdk/ResponseData.java
+18 −4		Adjust/adjust/src/main/java/com/adjust/sdk/SdkClickHandler.java
+8 −0		Adjust/adjust/src/main/java/com/adjust/sdk/SdkClickResponseData.java
+1 −1		Adjust/build.gradle
+2 −2		Adjust/example/build.gradle
+1 −1		Adjust/pom.xml
+1 −1		Adjust/pom_criteo.xml
+1 −1		Adjust/pom_sociomantic.xml
+1 −1		Adjust/pom_trademob.xml
+6 −0		Adjust/test/src/androidTest/java/com/adjust/sdk/MockActivityHandler.java
+10 −2		Adjust/test/src/androidTest/java/com/adjust/sdk/MockAttributionHandler.java
+12 −3		Adjust/test/src/androidTest/java/com/adjust/sdk/MockLogger.java
+3 −1		Adjust/test/src/androidTest/java/com/adjust/sdk/MockSdkClickHandler.java
+256 −134		Adjust/test/src/androidTest/java/com/adjust/sdk/TestActivityHandler.java
+28 −3		Adjust/test/src/androidTest/java/com/adjust/sdk/TestActivityPackage.java
+58 −1		Adjust/test/src/androidTest/java/com/adjust/sdk/TestAttributionHandler.java
+12 −7		Adjust/test/src/androidTest/java/com/adjust/sdk/TestSdkClickHandler.java
+10 −0		CHANGELOG.md
+6 −2		README.md
+1 −1		VERSION
+1 −1		doc/english/criteo_plugin.md
+1 −1		doc/english/migrate.md
+1 −1		doc/english/sociomantic_plugin.md
+1 −1		doc/english/trademob_plugin.md
+41 −0		doc/japanese/referrer_ja.md
+463 −0		doc/japanese/sociomantic_plugin_ja.md
+96 −0		doc/japanese/trademob_plugin_ja.md
+2 −2		Adjust.podspec
+179 −0		Adjust.xcodeproj/project.pbxproj
+1 −0		Adjust/ADJActivityHandler.h
+79 −24		Adjust/ADJActivityHandler.m
+2 −1		Adjust/ADJAdjustFactory.h
+4 −3		Adjust/ADJAdjustFactory.m
+2 −0		Adjust/ADJAttributionHandler.h
+16 −0		Adjust/ADJAttributionHandler.m
+11 −22		Adjust/ADJConfig.m
+2 −1		Adjust/ADJLogger.h
+18 −2		Adjust/ADJLogger.m
+2 −1		Adjust/ADJPackageBuilder.h
+25 −12		Adjust/ADJPackageBuilder.m
+3 −0		Adjust/ADJResponseData.h
+8 −0		Adjust/ADJResponseData.m
+5 −2		Adjust/ADJSdkClickHandler.h
+18 −5		Adjust/ADJSdkClickHandler.m
+1 −1		Adjust/ADJUtil.m
+1 −1		Adjust/Adjust.h
+17 −0		AdjustExampleTests/AppDelegate.h
+51 −0		AdjustExampleTests/AppDelegate.m
+48 −0		AdjustExampleTests/Assets.xcassets/AppIcon.appiconset/Contents.json
+27 −0		AdjustExampleTests/Base.lproj/LaunchScreen.storyboard
+26 −0		AdjustExampleTests/Base.lproj/Main.storyboard
+38 −0		AdjustExampleTests/Info.plist
+15 −0		AdjustExampleTests/ViewController.h
+29 −0		AdjustExampleTests/ViewController.m
+16 −0		AdjustExampleTests/main.m
+20 −16		AdjustTests/ADJActivityHandlerTests.m
+4 −3		AdjustTests/ADJAttributionHandlerMock.m
+14 −8		AdjustTests/ADJAttributionHandlerTests.m
+8 −2		AdjustTests/ADJLoggerMock.m
+0 −1		AdjustTests/ADJPackageFields.h
+1 −1		AdjustTests/ADJPackageFields.m
+6 −2		AdjustTests/ADJPackageHandlerTests.m
+4 −2		AdjustTests/ADJSdkClickHandlerMock.m
+20 −10		AdjustTests/ADJSdkClickHandlerTests.m
+10 −0		CHANGELOG.md
+3 −3		README.md
+1 −1		VERSION
+1 −1		doc/english/migrate.md
+1 −1		doc/japanese/migrate_ja.md
+1 −1		doc/migrate.md
+3 −19		plugin/Sociomantic/ADJSociomantic.h