Merge pull request #687 from adjust/v4353

Version 4.35.3
adjust · Nov 15, 2023 · a55e40f · a55e40f
2 parents 20c2666 + 6daa55c
commit a55e40f
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 19 deletions.
diff --git a/Adjust.podspec b/Adjust.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name           = "Adjust"
-  s.version        = "4.35.2"
+  s.version        = "4.35.3"
   s.summary        = "This is the iOS SDK of adjust. You can read more about it at http://adjust.com."
   s.homepage       = "https://github.com/adjust/ios_sdk"
   s.license        = { :type => 'MIT', :file => 'MIT-LICENSE' }

diff --git a/Adjust/ADJUrlStrategy.m b/Adjust/ADJUrlStrategy.m
@@ -26,8 +26,8 @@
 static NSString * const purchaseVerificationUrlChina = @"https://ssrv.adjust.world";
 
 static NSString * const baseUrlCn = @"https://app.adjust.cn";
-static NSString * const gdprUrlCn = @"https://gdpr.adjust.com"; // TODO: switch to .cn
-static NSString * const subscriptionUrlCn = @"https://subscription.adjust.com"; // TODO: switch to .cn
+static NSString * const gdprUrlCn = @"https://gdpr.adjust.cn";
+static NSString * const subscriptionUrlCn = @"https://subscription.adjust.cn";
 static NSString * const purchaseVerificationUrlCn = @"https://ssrv.adjust.cn";
 
 static NSString * const baseUrlEU = @"https://app.eu.adjust.com";
@@ -98,6 +98,8 @@ - (instancetype)initWithUrlStrategyInfo:(NSString *)urlStrategyInfo
         return @[baseUrlChina, baseUrl];
     } else if ([urlStrategyInfo isEqualToString:ADJUrlStrategyCn]) {
         return @[baseUrlCn, baseUrl];
+    } else if ([urlStrategyInfo isEqualToString:ADJUrlStrategyCnOnly]) {
+        return @[baseUrlCn];
     } else if ([urlStrategyInfo isEqualToString:ADJDataResidencyEU]) {
         return @[baseUrlEU];
     } else if ([urlStrategyInfo isEqualToString:ADJDataResidencyTR]) {
@@ -116,6 +118,8 @@ - (instancetype)initWithUrlStrategyInfo:(NSString *)urlStrategyInfo
         return @[gdprUrlChina, gdprUrl];
     } else if ([urlStrategyInfo isEqualToString:ADJUrlStrategyCn]) {
         return @[gdprUrlCn, gdprUrl];
+    } else if ([urlStrategyInfo isEqualToString:ADJUrlStrategyCnOnly]) {
+        return @[gdprUrlCn];
     } else if ([urlStrategyInfo isEqualToString:ADJDataResidencyEU]) {
         return @[gdprUrlEU];
     } else if ([urlStrategyInfo isEqualToString:ADJDataResidencyTR]) {
@@ -134,6 +138,8 @@ - (instancetype)initWithUrlStrategyInfo:(NSString *)urlStrategyInfo
         return @[subscriptionUrlChina, subscriptionUrl];
     } else if ([urlStrategyInfo isEqualToString:ADJUrlStrategyCn]) {
         return @[subscriptionUrlCn, subscriptionUrl];
+    } else if ([urlStrategyInfo isEqualToString:ADJUrlStrategyCnOnly]) {
+        return @[subscriptionUrlCn];
     } else if ([urlStrategyInfo isEqualToString:ADJDataResidencyEU]) {
         return @[subscriptionUrlEU];
     } else if ([urlStrategyInfo isEqualToString:ADJDataResidencyTR]) {
@@ -152,6 +158,8 @@ - (instancetype)initWithUrlStrategyInfo:(NSString *)urlStrategyInfo
         return @[purchaseVerificationUrlChina, purchaseVerificationUrl];
     } else if ([urlStrategyInfo isEqualToString:ADJUrlStrategyCn]) {
         return @[purchaseVerificationUrlCn, purchaseVerificationUrl];
+    } else if ([urlStrategyInfo isEqualToString:ADJUrlStrategyCnOnly]) {
+        return @[purchaseVerificationUrlCn];
     } else if ([urlStrategyInfo isEqualToString:ADJDataResidencyEU]) {
         return @[purchaseVerificationUrlEU];
     } else if ([urlStrategyInfo isEqualToString:ADJDataResidencyTR]) {

diff --git a/Adjust/ADJUtil.m b/Adjust/ADJUtil.m
@@ -35,7 +35,7 @@
 static NSRegularExpression *shortUniversalLinkRegex = nil;
 static NSRegularExpression *excludedDeeplinkRegex = nil;
 
-static NSString * const kClientSdk                  = @"ios4.35.2";
+static NSString * const kClientSdk                  = @"ios4.35.3";
 static NSString * const kDeeplinkParam              = @"deep_link=";
 static NSString * const kSchemeDelimiter            = @"://";
 static NSString * const kDefaultScheme              = @"AdjustUniversalScheme";

diff --git a/Adjust/Adjust.h b/Adjust/Adjust.h
@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust SDK
 //
-//  V4.35.2
+//  V4.35.3
 //  Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
 //  Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
 //
@@ -54,13 +54,16 @@ extern NSString * __nonnull const ADJAdRevenueSourceAdMost;
 extern NSString * __nonnull const ADJAdRevenueSourceUnity;
 extern NSString * __nonnull const ADJAdRevenueSourceHeliumChartboost;
 extern NSString * __nonnull const ADJAdRevenueSourcePublisher;
+extern NSString * __nonnull const ADJAdRevenueSourceTopOn;
+extern NSString * __nonnull const ADJAdRevenueSourceADX;
 
 /**
  * Constants for country app's URL strategies.
  */
 extern NSString * __nonnull const ADJUrlStrategyIndia;
 extern NSString * __nonnull const ADJUrlStrategyChina;
 extern NSString * __nonnull const ADJUrlStrategyCn;
+extern NSString * __nonnull const ADJUrlStrategyCnOnly;
 extern NSString * __nonnull const ADJDataResidencyEU;
 extern NSString * __nonnull const ADJDataResidencyTR;
 extern NSString * __nonnull const ADJDataResidencyUS;

diff --git a/Adjust/Adjust.m b/Adjust/Adjust.m
@@ -30,10 +30,13 @@
 NSString * const ADJAdRevenueSourceUnity = @"unity_sdk";
 NSString * const ADJAdRevenueSourceHeliumChartboost = @"helium_chartboost_sdk";
 NSString * const ADJAdRevenueSourcePublisher = @"publisher_sdk";
+NSString * const ADJAdRevenueSourceTopOn = @"topon_sdk";
+NSString * const ADJAdRevenueSourceADX = @"adx_sdk";
 
 NSString * const ADJUrlStrategyIndia = @"UrlStrategyIndia";
 NSString * const ADJUrlStrategyChina = @"UrlStrategyChina";
 NSString * const ADJUrlStrategyCn = @"UrlStrategyCn";
+NSString * const ADJUrlStrategyCnOnly = @"UrlStrategyCnOnly";
 
 NSString * const ADJDataResidencyEU = @"DataResidencyEU";
 NSString * const ADJDataResidencyTR = @"DataResidencyTR";

diff --git a/AdjustBridge/AdjustBridgeRegister.m b/AdjustBridge/AdjustBridgeRegister.m
@@ -275,7 +275,7 @@ + (NSString *)adjust_js {
                 if (this.sdkPrefix) {
                     return this.sdkPrefix;
                 } else {
-                    return 'web-bridge4.35.2';
+                    return 'web-bridge4.35.3';
                 }
             },
             setTestOptions: function(testOptions) {
@@ -398,6 +398,7 @@ + (NSString *)adjust_js {
         AdjustConfig.UrlStrategyIndia = 'UrlStrategyIndia';
         AdjustConfig.UrlStrategyChina = 'UrlStrategyChina';
         AdjustConfig.UrlStrategyCn = 'UrlStrategyCn';
+        AdjustConfig.UrlStrategyCnOnly = 'UrlStrategyCnOnly';
         AdjustConfig.DataResidencyEU = 'DataResidencyEU';
         AdjustConfig.DataResidencyTR = 'DataResidencyTR';
         AdjustConfig.DataResidencyUS = 'DataResidencyUS';

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### Version 4.35.3 (15th November 2023)
+#### Added
+- Added support for `TopOn` and `ADX` ad revenue sources.
+- Added a new type of URL strategy called `ADJUrlStrategyCnOnly`. This URL strategy represents `ADJUrlStrategyCn` strategy, but without fallback domains.
+
+---
+
 ### Version 4.35.2 (9th October 2023)
 #### Added
 - Added sending of `event_callback_id` parameter (if set) with the event payload.
@@ -6,7 +13,7 @@
 
 ### Version 4.35.1 (2nd October 2023)
 #### Fixed
-- Fixed issue with signing requests post ATT delay timer exipry.
+- Fixed issue with signing requests post ATT delay timer expiry.
 
 ---
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.35.2
+4.35.3
diff --git a/examples/AdjustExample-Swift/Podfile.lock b/examples/AdjustExample-Swift/Podfile.lock
@@ -1,7 +1,7 @@
 PODS:
-  - Adjust (4.35.2):
-    - Adjust/Core (= 4.35.2)
-  - Adjust/Core (4.35.2)
+  - Adjust (4.35.3):
+    - Adjust/Core (= 4.35.3)
+  - Adjust/Core (4.35.3)
 
 DEPENDENCIES:
   - Adjust (from `../../`)
@@ -11,7 +11,7 @@ EXTERNAL SOURCES:
     :path: "../../"
 
 SPEC CHECKSUMS:
-  Adjust: cac836ba910f868b38d0350045aaf498f794719a
+  Adjust: d82bf78d135ed930acdb73826aad67e66471eea9
 
 PODFILE CHECKSUM: 4c79da456db9adb90cdd42adc7f721c7bb6490cd
 

diff --git a/scripts/dynamic_xcframeworks.sh b/scripts/dynamic_xcframeworks.sh
@@ -116,16 +116,19 @@ then
   echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =${NC}"
   echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} XCFramework: Archiving (ZIP) Dynamic XCFramework for ${TRAGET_PLATFORM_DESCRIPTION} ...${NC}"
   echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =${NC}"
- 
+
   # VERIFY
 
-  if [[ $BUILD_TARGET_IOS -eq 1 ]] 
-  then 
+  if [[ $BUILD_TARGET_IOS -eq 1 ]] && [[ $BUILD_TARGET_TVOS -eq 1 ]]
+  then
     archive_framework "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_XCFRMK_FOLDER}" "${XCF_FRM_NAME__ADJUST_IOS}.xcframework" "${XCF_FRM_ZIP_NAME__IOS_TV_DYNAMIC}-"${SDK_VERSION}".xcframework.zip"
+  elif [[ $BUILD_TARGET_IOS -eq 1 ]]
+  then
+    archive_framework "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_XCFRMK_FOLDER}" "${XCF_FRM_NAME__ADJUST_IOS}.xcframework" "${XCF_FRM_ZIP_NAME__IOS_DYNAMIC}-"${SDK_VERSION}".xcframework.zip"
   else
     archive_framework "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_XCFRMK_FOLDER}" "${XCF_FRM_NAME__ADJUST_TV}.xcframework" "${XCF_FRM_ZIP_NAME__TV_DYNAMIC}-"${SDK_VERSION}".xcframework.zip"
   fi
-  
+
 fi
 
 # = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =

diff --git a/scripts/static_xcframeworks.sh b/scripts/static_xcframeworks.sh
@@ -93,13 +93,15 @@ then
   echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} XCFramework: Archiving (ZIP) Static XCFramework for ${TRAGET_PLATFORM_DESCRIPTION} ...${NC}"
   echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =${NC}"
 
-  if [[ $BUILD_TARGET_IOS -eq 1 ]] 
-  then 
+  if [[ $BUILD_TARGET_IOS -eq 1 ]] && [[ $BUILD_TARGET_TVOS -eq 1 ]]
+  then
     archive_framework "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_STATIC_XCFRMK_FOLDER}" "${XCF_FRM_NAME__ADJUST_IOS}.xcframework" "${XCF_FRM_ZIP_NAME__IOS_TV_STATIC}-"${SDK_VERSION}".xcframework.zip"
+  elif [[ $BUILD_TARGET_IOS -eq 1 ]]
+  then
+    archive_framework "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_STATIC_XCFRMK_FOLDER}" "${XCF_FRM_NAME__ADJUST_IOS}.xcframework" "${XCF_FRM_ZIP_NAME__IOS_STATIC}-"${SDK_VERSION}".xcframework.zip"
   else
     archive_framework "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_STATIC_XCFRMK_FOLDER}" "${XCF_FRM_NAME__ADJUST_TV}.xcframework" "${XCF_FRM_ZIP_NAME__TV_STATIC}-"${SDK_VERSION}".xcframework.zip"
   fi
-
 fi
 
 # = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =
@@ -145,6 +147,8 @@ then
   echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} XCFramework: Buiding Static XCFramework for iOS (WebBridge)...${NC}"
   echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =${NC}"
 
+  xcodebuild clean
+
   xcodebuild -configuration Release \
   -target ${SCHEMA_NAME__ADJUST_WEB_BRIDGE_STATIC} \
   -sdk iphonesimulator \