Skip to content

Commit

Permalink
Merge pull request #39 from adjust/v4280
Browse files Browse the repository at this point in the history
Version 4.28.0
  • Loading branch information
uerceg committed Apr 2, 2021
2 parents 0536d7b + 391b0ed commit c1b6237
Show file tree
Hide file tree
Showing 18 changed files with 81 additions and 27 deletions.
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.23.1
4.28.0
2 changes: 1 addition & 1 deletion dist/AdjustConfig2dx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
2 changes: 1 addition & 1 deletion doc/migrate.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Binary file modified ext/android/proxy/adjust-android.jar
Binary file not shown.
Binary file modified ext/android/proxy/adjust-test.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion ext/android/sdk
Submodule sdk updated 102 files
2 changes: 1 addition & 1 deletion ext/ios/sdk
Submodule sdk updated 93 files
+2 −2 Adjust.podspec
+95 −48 Adjust.xcodeproj/project.pbxproj
+1 −1 Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdk.xcscheme
+1 −1 Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkIm.xcscheme
+1 −1 Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkTv.xcscheme
+1 −1 Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkWebBridge.xcscheme
+61 −52 Adjust/ADJActivityHandler.h
+255 −36 Adjust/ADJActivityHandler.m
+3 −1 Adjust/ADJActivityKind.h
+8 −0 Adjust/ADJActivityKind.m
+0 −34 Adjust/ADJActivityState.m
+15 −0 Adjust/ADJAdditions/NSNumber+ADJAdditions.h
+21 −0 Adjust/ADJAdditions/NSNumber+ADJAdditions.m
+0 −2 Adjust/ADJAdditions/NSString+ADJAdditions.h
+0 −27 Adjust/ADJAdditions/NSString+ADJAdditions.m
+1 −1 Adjust/ADJAdditions/UIDevice+ADJAdditions.h
+53 −107 Adjust/ADJAdditions/UIDevice+ADJAdditions.m
+2 −0 Adjust/ADJAdjustFactory.h
+11 −0 Adjust/ADJAdjustFactory.m
+15 −0 Adjust/ADJAttribution.h
+71 −44 Adjust/ADJAttribution.m
+10 −0 Adjust/ADJConfig.h
+20 −23 Adjust/ADJConfig.m
+0 −16 Adjust/ADJKeychain.h
+0 −144 Adjust/ADJKeychain.m
+47 −30 Adjust/ADJPackageBuilder.h
+266 −60 Adjust/ADJPackageBuilder.m
+46 −63 Adjust/ADJPackageHandler.m
+11 −12 Adjust/ADJRequestHandler.m
+26 −0 Adjust/ADJSdkClickHandler.m
+0 −6 Adjust/ADJSystemProfile.h
+1 −64 Adjust/ADJSystemProfile.m
+23 −0 Adjust/ADJThirdPartySharing.h
+44 −0 Adjust/ADJThirdPartySharing.m
+1 −1 Adjust/ADJUrlStrategy.h
+31 −4 Adjust/ADJUrlStrategy.m
+3 −0 Adjust/ADJUserDefaults.h
+11 −0 Adjust/ADJUserDefaults.m
+1 −9 Adjust/ADJUtil.h
+85 −91 Adjust/ADJUtil.m
+17 −1 Adjust/Adjust.h
+61 −6 Adjust/Adjust.m
+1 −0 Adjust/include/ADJThirdPartySharing.h
+69 −2 AdjustBridge/AdjustBridge.m
+47 −1 AdjustBridge/AdjustBridgeRegister.m
+1 −0 AdjustSdk/AdjustSdk.h
+1 −0 AdjustSdkIm/AdjustSdkIm.h
+1 −0 AdjustSdkTv/AdjustSdkTv.h
+1 −0 AdjustSdkWebBridge/AdjustSdkWebBridge.h
+19 −7 AdjustTests/AdjustTestApp/AdjustTestApp.xcodeproj/project.pbxproj
+53 −0 AdjustTests/AdjustTestApp/AdjustTestApp/ATAAdjustCommandExecutor.m
+3 −0 AdjustTests/AdjustTestApp/AdjustTestApp/Delegates/ATAAdjustDelegateAttribution.m
+10 −4 AdjustTests/AdjustTestApp/AdjustTestApp/ViewController.h
+2 −2 AdjustTests/AdjustTestApp/AdjustTestApp/ViewController.m
+5 −1 AdjustTests/AdjustTestLibrary/AdjustTestLibrary.xcodeproj/project.pbxproj
+1 −1 AdjustTests/AdjustUnitTests/ADJPackageFields.m
+19 −7 AdjustTests/AdjustWebBridgeTestApp/AdjustWebBridgeTestApp.xcodeproj/project.pbxproj
+1 −1 ...ustWebBridgeTestApp/AdjustWebBridgeTestApp.xcodeproj/xcshareddata/xcschemes/AdjustWebBridgeTestApp.xcscheme
+5 −0 AdjustTests/AdjustWebBridgeTestApp/AdjustWebBridgeTestApp/TestLibraryBridge.h
+57 −0 AdjustTests/AdjustWebBridgeTestApp/AdjustWebBridgeTestApp/TestLibraryBridge.js
+3 −1 AdjustTests/PocketSocket/PocketSocket.xcodeproj/project.pbxproj
+1 −1 AdjustTests/PocketSocket/PocketSocket.xcodeproj/xcshareddata/xcschemes/PocketSocket-Mac.xcscheme
+1 −1 AdjustTests/PocketSocket/PocketSocket.xcodeproj/xcshareddata/xcschemes/PocketSocket.xcscheme
+73 −0 CHANGELOG.md
+83 −14 README.md
+1 −1 VERSION
+8 −7 doc/chinese/README.md
+1 −1 doc/english/migrate.md
+1 −1 doc/english/web_views.md
+11 −10 doc/japanese/README.md
+15 −26 doc/japanese/web_views.md
+17 −5 doc/korean/README.md
+1 −1 doc/korean/web_views.md
+1 −1 doc/migrate.md
+567 −284 examples/AdjustExample-FbPixel/AdjustExample-FbPixel.xcodeproj/project.pbxproj
+21 −7 examples/AdjustExample-ObjC/AdjustExample-ObjC.xcodeproj/project.pbxproj
+78 −0 examples/AdjustExample-ObjC/AdjustExample-ObjC.xcodeproj/xcshareddata/xcschemes/AdjustExample-ObjC.xcscheme
+2 −2 examples/AdjustExample-ObjC/AdjustExample-ObjC/AppDelegate.m
+2 −0 examples/AdjustExample-ObjC/AdjustExample-ObjC/Info.plist
+21 −8 examples/AdjustExample-Swift/AdjustExample-Swift.xcodeproj/project.pbxproj
+1 −1 examples/AdjustExample-Swift/AdjustExample-Swift.xcodeproj/xcshareddata/xcschemes/AdjustExample-Swift.xcscheme
+29 −8 examples/AdjustExample-WebView/AdjustExample-WebView.xcodeproj/project.pbxproj
+13 −1 examples/AdjustExample-WebView/AdjustExample-WebView/AdjustExample-WebView.html
+2 −0 examples/AdjustExample-WebView/AdjustExample-WebView/Info.plist
+1 −1 examples/AdjustExample-WebView/AdjustExample-WebView/WKWebViewController.h
+13 −0 examples/AdjustExample-WebView/AdjustExample-WebView/WKWebViewController.m
+17 −8 examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/project.pbxproj
+1 −1 ...e/AdjustExample-iMessage.xcodeproj/xcshareddata/xcschemes/AdjustExample-iMessage MessagesExtension.xcscheme
+1 −1 ...ustExample-iMessage/AdjustExample-iMessage.xcodeproj/xcshareddata/xcschemes/AdjustExample-iMessage.xcscheme
+17 −8 examples/AdjustExample-iWatch/AdjustExample-iWatch.xcodeproj/project.pbxproj
+17 −8 examples/AdjustExample-tvOS/AdjustExample-tvOS.xcodeproj/project.pbxproj
+6 −3 scripts/build.sh
+20 −0 scripts/carthage_xcode12.sh
Binary file modified libs/android/adjust-android.jar
Binary file not shown.
Binary file modified libs/ios/AdjustSdk.framework/Versions/A/AdjustSdk
Binary file not shown.
15 changes: 15 additions & 0 deletions libs/ios/AdjustSdk.framework/Versions/A/Headers/ADJAttribution.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down
10 changes: 10 additions & 0 deletions libs/ios/AdjustSdk.framework/Versions/A/Headers/ADJConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand All @@ -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.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//
// ADJThirdPartySharing.h
// AdjustSdk
//
// Created by Pedro S. on 02.12.20.
// Copyright © 2020 adjust GmbH. All rights reserved.
//

#import <Foundation/Foundation.h>

@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

18 changes: 17 additions & 1 deletion libs/ios/AdjustSdk.framework/Versions/A/Headers/Adjust.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
//
Expand All @@ -11,6 +11,7 @@
#import "ADJConfig.h"
#import "ADJAttribution.h"
#import "ADJSubscription.h"
#import "ADJThirdPartySharing.h"

@interface AdjustTestOptions : NSObject

Expand All @@ -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;

Expand All @@ -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;
Expand All @@ -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.
Expand Down Expand Up @@ -273,6 +277,10 @@ extern NSString * __nonnull const ADJUrlStrategyChina;
*/
+ (void)disableThirdPartySharing;

+ (void)trackThirdPartySharing:(nonnull ADJThirdPartySharing *)thirdPartySharing;

+ (void)trackMeasurementConsent:(BOOL)enabled;

/**
* @brief Track subscription.
*
Expand All @@ -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.
*/
Expand Down Expand Up @@ -343,4 +355,8 @@ extern NSString * __nonnull const ADJUrlStrategyChina;

- (void)requestTrackingAuthorizationWithCompletionHandler:(void (^_Nullable)(NSUInteger status))completion;

- (int)appTrackingAuthorizationStatus;

- (void)updateConversionValue:(NSInteger)conversionValue;

@end
2 changes: 1 addition & 1 deletion src/AdjustConfig2dx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Binary file modified test/libs/android/adjust-test.jar
Binary file not shown.
Binary file not shown.

This file was deleted.

0 comments on commit c1b6237

Please sign in to comment.