diff --git a/CHANGELOG.md b/CHANGELOG.md index 1aeaf3da..612bb843 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +### Version 4.28.0 (3rd April 2021) +#### Changed +- Removed native iOS legacy code. + +#### Native SDKs +- [iOS@v4.28.0][ios_sdk_v4.28.0] +- [Android@v4.27.0][android_sdk_v4.27.0] + +--- + ### Version 4.23.1 (29th September 2020) #### Fixed - Fixed duplicate `ADJUrlStrategy` symbol error. @@ -17,8 +27,6 @@ - Added sending of value of user's consent to be tracked with each package. - Added `setUrlStrategy` method to `AdjustConfig2dx` class to allow selection of URL strategy for specific market. -⚠️ **Note**: iOS 14 beta versions prior to 5 appear to have an issue when trying to use iAd framework API like described in [here](https://github.com/adjust/ios_sdk/issues/452). For testing of v4.23.0 version of SDK in iOS, please make sure you're using **iOS 14 beta 5 or later**. - #### Native SDKs - [iOS@v4.23.0][ios_sdk_v4.23.0] - [Android@v4.24.0][android_sdk_v4.24.0] diff --git a/VERSION b/VERSION index 0ef2c601..ad94be36 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.23.1 +4.28.0 diff --git a/dist/AdjustConfig2dx.cpp b/dist/AdjustConfig2dx.cpp index 4a7554c7..364115f5 100755 --- a/dist/AdjustConfig2dx.cpp +++ b/dist/AdjustConfig2dx.cpp @@ -15,7 +15,7 @@ #include "AdjustConfig2dx.h" USING_NS_CC; -const std::string AdjustSdkPrefix2dx = "cocos2d-x4.23.1"; +const std::string AdjustSdkPrefix2dx = "cocos2d-x4.28.0"; const std::string AdjustUrlStrategyChina = "china"; const std::string AdjustUrlStrategyIndia = "india"; diff --git a/doc/migrate.md b/doc/migrate.md index 2750e541..8216005c 100644 --- a/doc/migrate.md +++ b/doc/migrate.md @@ -1,4 +1,4 @@ -## Migrate your Adjust SDK for Cocos2d-x to 4.23.1 from 4.0.x +## Migrate your Adjust SDK for Cocos2d-x to 4.28.0 from 4.0.x ### SDK initialization diff --git a/ext/android/proxy/adjust-android.jar b/ext/android/proxy/adjust-android.jar index 18171f8a..32e9005d 100644 Binary files a/ext/android/proxy/adjust-android.jar and b/ext/android/proxy/adjust-android.jar differ diff --git a/ext/android/proxy/adjust-test.jar b/ext/android/proxy/adjust-test.jar index 4eb0b02d..0fad79c7 100644 Binary files a/ext/android/proxy/adjust-test.jar and b/ext/android/proxy/adjust-test.jar differ diff --git a/ext/android/sdk b/ext/android/sdk index 2242fb85..4d69036b 160000 --- a/ext/android/sdk +++ b/ext/android/sdk @@ -1 +1 @@ -Subproject commit 2242fb85c80b6376d28d05a663b23dae69e9e7d3 +Subproject commit 4d69036bf44285c03dff4d3ed94ef7839bc17a59 diff --git a/ext/ios/sdk b/ext/ios/sdk index 950ba354..8790a530 160000 --- a/ext/ios/sdk +++ b/ext/ios/sdk @@ -1 +1 @@ -Subproject commit 950ba354221fe329c89c82a8f9a5f04bfc0bf1ac +Subproject commit 8790a5300d00a11b8f51c7cc66c94165ac656f8c diff --git a/libs/android/adjust-android.jar b/libs/android/adjust-android.jar index 18171f8a..32e9005d 100644 Binary files a/libs/android/adjust-android.jar and b/libs/android/adjust-android.jar differ diff --git a/libs/ios/AdjustSdk.framework/Versions/A/AdjustSdk b/libs/ios/AdjustSdk.framework/Versions/A/AdjustSdk index d2f59df3..9c94430d 100644 Binary files a/libs/ios/AdjustSdk.framework/Versions/A/AdjustSdk and b/libs/ios/AdjustSdk.framework/Versions/A/AdjustSdk differ diff --git a/libs/ios/AdjustSdk.framework/Versions/A/Headers/ADJAttribution.h b/libs/ios/AdjustSdk.framework/Versions/A/Headers/ADJAttribution.h index 2fe89c25..845a909a 100644 --- a/libs/ios/AdjustSdk.framework/Versions/A/Headers/ADJAttribution.h +++ b/libs/ios/AdjustSdk.framework/Versions/A/Headers/ADJAttribution.h @@ -53,6 +53,21 @@ */ @property (nonatomic, copy, nullable) NSString *adid; +/** + * @brief Cost type. + */ +@property (nonatomic, copy, nullable) NSString *costType; + +/** + * @brief Cost amount. + */ +@property (nonatomic, copy, nullable) NSNumber *costAmount; + +/** + * @brief Cost currency. + */ +@property (nonatomic, copy, nullable) NSString *costCurrency; + /** * @brief Make attribution object. * diff --git a/libs/ios/AdjustSdk.framework/Versions/A/Headers/ADJConfig.h b/libs/ios/AdjustSdk.framework/Versions/A/Headers/ADJConfig.h index 4e8458ad..b062cf98 100644 --- a/libs/ios/AdjustSdk.framework/Versions/A/Headers/ADJConfig.h +++ b/libs/ios/AdjustSdk.framework/Versions/A/Headers/ADJConfig.h @@ -148,6 +148,11 @@ */ @property (nonatomic, assign) BOOL allowiAdInfoReading; +/** + * @brief Enables/disables reading of AdServices framework data needed for attribution. + */ +@property (nonatomic, assign) BOOL allowAdServicesInfoReading; + /** * @brief Enables/disables reading of IDFA parameter. */ @@ -168,6 +173,11 @@ */ @property (nonatomic, assign) BOOL isDeviceKnown; +/** + * @brief Set if cost data is needed in attribution response. + */ +@property (nonatomic, assign) BOOL needsCost; + /** * @brief Adjust app secret id. */ diff --git a/libs/ios/AdjustSdk.framework/Versions/A/Headers/ADJThirdPartySharing.h b/libs/ios/AdjustSdk.framework/Versions/A/Headers/ADJThirdPartySharing.h new file mode 100644 index 00000000..610ca80b --- /dev/null +++ b/libs/ios/AdjustSdk.framework/Versions/A/Headers/ADJThirdPartySharing.h @@ -0,0 +1,23 @@ +// +// ADJThirdPartySharing.h +// AdjustSdk +// +// Created by Pedro S. on 02.12.20. +// Copyright © 2020 adjust GmbH. All rights reserved. +// + +#import + +@interface ADJThirdPartySharing : NSObject + +- (nullable id)initWithIsEnabledNumberBool:(nullable NSNumber *)isEnabledNumberBool; + +- (void)addGranularOption:(nonnull NSString *)partnerName + key:(nonnull NSString *)key + value:(nonnull NSString *)value; + +@property (nonatomic, nullable, readonly, strong) NSNumber *enabled; +@property (nonatomic, nonnull, readonly, strong) NSMutableDictionary *granularOptions; + +@end + diff --git a/libs/ios/AdjustSdk.framework/Versions/A/Headers/Adjust.h b/libs/ios/AdjustSdk.framework/Versions/A/Headers/Adjust.h index 2d7605e3..efe4dee1 100644 --- a/libs/ios/AdjustSdk.framework/Versions/A/Headers/Adjust.h +++ b/libs/ios/AdjustSdk.framework/Versions/A/Headers/Adjust.h @@ -2,7 +2,7 @@ // Adjust.h // Adjust // -// V4.23.2 +// V4.28.0 // Created by Christian Wellenbrock (wellle) on 23rd July 2013. // Copyright © 2012-2017 Adjust GmbH. All rights reserved. // @@ -11,6 +11,7 @@ #import "ADJConfig.h" #import "ADJAttribution.h" #import "ADJSubscription.h" +#import "ADJThirdPartySharing.h" @interface AdjustTestOptions : NSObject @@ -26,6 +27,7 @@ @property (nonatomic, assign) BOOL deleteState; @property (nonatomic, assign) BOOL noBackoffWait; @property (nonatomic, assign) BOOL iAdFrameworkEnabled; +@property (nonatomic, assign) BOOL adServicesFrameworkEnabled; @property (nonatomic, assign) BOOL enableSigning; @property (nonatomic, assign) BOOL disableSigning; @@ -43,6 +45,7 @@ extern NSString * __nonnull const ADJEnvironmentProduction; extern NSString * __nonnull const ADJAdRevenueSourceMopub; extern NSString * __nonnull const ADJAdRevenueSourceAdmob; extern NSString * __nonnull const ADJAdRevenueSourceFbNativeAd; +extern NSString * __nonnull const ADJAdRevenueSourceFbAudienceNetwork; extern NSString * __nonnull const ADJAdRevenueSourceIronsource; extern NSString * __nonnull const ADJAdRevenueSourceFyber; extern NSString * __nonnull const ADJAdRevenueSourceAerserv; @@ -64,6 +67,7 @@ extern NSString * __nonnull const ADJAdRevenueSourceTapdaq; */ extern NSString * __nonnull const ADJUrlStrategyIndia; extern NSString * __nonnull const ADJUrlStrategyChina; +extern NSString * __nonnull const ADJDataResidencyEU; /** * @brief The main interface to Adjust. @@ -273,6 +277,10 @@ extern NSString * __nonnull const ADJUrlStrategyChina; */ + (void)disableThirdPartySharing; ++ (void)trackThirdPartySharing:(nonnull ADJThirdPartySharing *)thirdPartySharing; + ++ (void)trackMeasurementConsent:(BOOL)enabled; + /** * @brief Track subscription. * @@ -282,6 +290,10 @@ extern NSString * __nonnull const ADJUrlStrategyChina; + (void)requestTrackingAuthorizationWithCompletionHandler:(void (^_Nullable)(NSUInteger status))completion; ++ (int)appTrackingAuthorizationStatus; + ++ (void)updateConversionValue:(NSInteger)conversionValue; + /** * Obtain singleton Adjust object. */ @@ -343,4 +355,8 @@ extern NSString * __nonnull const ADJUrlStrategyChina; - (void)requestTrackingAuthorizationWithCompletionHandler:(void (^_Nullable)(NSUInteger status))completion; +- (int)appTrackingAuthorizationStatus; + +- (void)updateConversionValue:(NSInteger)conversionValue; + @end diff --git a/src/AdjustConfig2dx.cpp b/src/AdjustConfig2dx.cpp index 4a7554c7..364115f5 100755 --- a/src/AdjustConfig2dx.cpp +++ b/src/AdjustConfig2dx.cpp @@ -15,7 +15,7 @@ #include "AdjustConfig2dx.h" USING_NS_CC; -const std::string AdjustSdkPrefix2dx = "cocos2d-x4.23.1"; +const std::string AdjustSdkPrefix2dx = "cocos2d-x4.28.0"; const std::string AdjustUrlStrategyChina = "china"; const std::string AdjustUrlStrategyIndia = "india"; diff --git a/test/libs/android/adjust-test.jar b/test/libs/android/adjust-test.jar index 4eb0b02d..0fad79c7 100644 Binary files a/test/libs/android/adjust-test.jar and b/test/libs/android/adjust-test.jar differ diff --git a/test/libs/ios/AdjustTestLibrary.framework/Versions/A/AdjustTestLibrary b/test/libs/ios/AdjustTestLibrary.framework/Versions/A/AdjustTestLibrary index 359848bf..c58e0eb1 100644 Binary files a/test/libs/ios/AdjustTestLibrary.framework/Versions/A/AdjustTestLibrary and b/test/libs/ios/AdjustTestLibrary.framework/Versions/A/AdjustTestLibrary differ diff --git a/test/libs/ios/AdjustTestLibrary.framework/Versions/A/Headers/ATLControlChannel.h b/test/libs/ios/AdjustTestLibrary.framework/Versions/A/Headers/ATLControlChannel.h deleted file mode 100644 index 377f35aa..00000000 --- a/test/libs/ios/AdjustTestLibrary.framework/Versions/A/Headers/ATLControlChannel.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// ATLControlChannel.h -// AdjustTestLibrary -// -// Created by Pedro on 23.08.17. -// Copyright © 2017 adjust. All rights reserved. -// - -#import -#import "ATLTestLibrary.h" - -@interface ATLControlChannel : NSObject - -- (id)initWithTestLibrary:(ATLTestLibrary *)testLibrary; - -- (void)teardown; - -@end