Merge pull request #774 from adjust/v545

genadyb · web-flow · commit 517f44c72385 · 2025-09-26T12:23:10.000+02:00
Version 5.4.5
diff --git a/Adjust.podspec b/Adjust.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name                    = "Adjust"
   s.module_name             = "AdjustSdk"
-  s.version                 = "5.4.4"
+  s.version                 = "5.4.5"
   s.summary                 = "This is the iOS SDK of Adjust. You can read more about it at https://adjust.com."
   s.homepage                = "https://github.com/adjust/ios_sdk"
   s.license                 = { :type => 'MIT', :file => 'LICENSE' }
diff --git a/Adjust/Adjust.h b/Adjust/Adjust.h
@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust SDK
 //
-//  V5.4.4
+//  V5.4.5
 //  Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
 //  Copyright (c) 2012-Present Adjust GmbH. All rights reserved.
 //
diff --git a/Adjust/Internal/ADJOdmManager.m b/Adjust/Internal/ADJOdmManager.m
@@ -41,11 +41,8 @@ - (id _Nullable)initIfPluginAvailbleAndFetchOdmData {
             [_logger verbose:@"GoogleAdsOnDeviceConversion framework version %@ successfully found in the app", [ADJOdmManager odmFrameworkVersion]];
             isOdmAvailable = YES;
         } else {
-            [_logger warn:@"%@", error];
-            [_logger warn:@"ADJOdmPlugin can not be initialized"];
+            [_logger error:@"ADJOdmPlugin can not be initialized. Error: %@", error];
         }
-    } else {
-        [_logger warn:@"ADJOdmPlugin can not be initialized"];
     }
 
     if (!isOdmAvailable) {
@@ -171,7 +168,7 @@ - (void)completeProcessingOdmInfoWithSuccess:(BOOL)success {
         // Update UserDefaults in case odmInfo was processed successfully.
         if (success) {
             [ADJUserDefaults setGoogleOdmInfoProcessed];
-            [self.logger warn:@"GoogleAdsOnDeviceConversion info has been processed"];
+            [self.logger verbose:@"GoogleAdsOnDeviceConversion info has been processed"];
         }
     });
 }
@@ -181,7 +178,7 @@ - (void)completeProcessingOdmInfoWithSuccess:(BOOL)success {
 + (BOOL)isOdmPluginAvailable {
     Class odmPluginClass = NSClassFromString(@"ADJOdmPlugin");
     if (odmPluginClass == nil) {
-        [[ADJAdjustFactory logger] error:@"ADJOdmPlugin class not found"];
+        [[ADJAdjustFactory logger] verbose:@"ADJOdmPlugin class not found"];
         return NO;
     }
 
diff --git a/Adjust/Internal/ADJUtil.m b/Adjust/Internal/ADJUtil.m
@@ -31,7 +31,7 @@
 static NSRegularExpression *goLinkUniversalLinkRegex = nil;
 static NSRegularExpression *excludedDeeplinkRegex = nil;
 
-static NSString * const kClientSdk                  = @"ios5.4.4";
+static NSString * const kClientSdk                  = @"ios5.4.5";
 static NSString * const kDeeplinkParam              = @"deep_link=";
 static NSString * const kSchemeDelimiter            = @"://";
 static NSString * const kDefaultScheme              = @"AdjustUniversalScheme";
diff --git a/AdjustBridge/AdjustBridgeRegister.m b/AdjustBridge/AdjustBridgeRegister.m
@@ -176,7 +176,7 @@ function canSend(okCheck, errReason) {
                 if (this.sdkPrefix) {
                     return this.sdkPrefix;
                 } else {
-                    return 'web-bridge5.4.4';
+                    return 'web-bridge5.4.5';
                 }
             },
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### Version 5.4.5 (26th September 2025)
+#### Fixed
+- Updated the Swift Package Manager dependency constraint for `GoogleAdsOnDeviceConversion` to ensure compatibility with version 3.x.x (https://github.com/adjust/ios_sdk/issues/773).
+
+---
+
 ### Version 5.4.4 (25th August 2025)
 #### Added
 - Added support for processing deferred deep links in session responses.
diff --git a/Carthage/AdjustSdk-Dynamic.json b/Carthage/AdjustSdk-Dynamic.json
@@ -1,4 +1,5 @@
 {
+  "5.4.5": "https://github.com/adjust/ios_sdk/releases/download/v5.4.5/AdjustSdk-iOS-tvOS-Dynamic-5.4.5.xcframework.zip",
   "5.4.4": "https://github.com/adjust/ios_sdk/releases/download/v5.4.4/AdjustSdk-iOS-tvOS-Dynamic-5.4.4.xcframework.zip",
   "5.4.3": "https://github.com/adjust/ios_sdk/releases/download/v5.4.3/AdjustSdk-iOS-tvOS-Dynamic-5.4.3.xcframework.zip",
   "5.4.2": "https://github.com/adjust/ios_sdk/releases/download/v5.4.2/AdjustSdk-iOS-tvOS-Dynamic-5.4.2.xcframework.zip",
diff --git a/Carthage/AdjustSdk-Static.json b/Carthage/AdjustSdk-Static.json
@@ -1,4 +1,5 @@
 {
+  "5.4.5": "https://github.com/adjust/ios_sdk/releases/download/v5.4.5/AdjustSdk-iOS-tvOS-Static-5.4.5.xcframework.zip",
   "5.4.4": "https://github.com/adjust/ios_sdk/releases/download/v5.4.4/AdjustSdk-iOS-tvOS-Static-5.4.4.xcframework.zip",
   "5.4.3": "https://github.com/adjust/ios_sdk/releases/download/v5.4.3/AdjustSdk-iOS-tvOS-Static-5.4.3.xcframework.zip",
   "5.4.2": "https://github.com/adjust/ios_sdk/releases/download/v5.4.2/AdjustSdk-iOS-tvOS-Static-5.4.2.xcframework.zip",
diff --git a/Carthage/AdjustSdkIm-Dynamic.json b/Carthage/AdjustSdkIm-Dynamic.json
@@ -1,4 +1,5 @@
 {
+  "5.4.5": "https://github.com/adjust/ios_sdk/releases/download/v5.4.5/AdjustSdk-iMessage-Dynamic-5.4.5.xcframework.zip",
   "5.4.4": "https://github.com/adjust/ios_sdk/releases/download/v5.4.4/AdjustSdk-iMessage-Dynamic-5.4.4.xcframework.zip",
   "5.4.3": "https://github.com/adjust/ios_sdk/releases/download/v5.4.3/AdjustSdk-iMessage-Dynamic-5.4.3.xcframework.zip",
   "5.4.2": "https://github.com/adjust/ios_sdk/releases/download/v5.4.2/AdjustSdk-iMessage-Dynamic-5.4.2.xcframework.zip",
diff --git a/Carthage/AdjustSdkIm-Static.json b/Carthage/AdjustSdkIm-Static.json
@@ -1,4 +1,5 @@
 {
+  "5.4.5": "https://github.com/adjust/ios_sdk/releases/download/v5.4.5/AdjustSdk-iMessage-Static-5.4.5.xcframework.zip",
   "5.4.4": "https://github.com/adjust/ios_sdk/releases/download/v5.4.4/AdjustSdk-iMessage-Static-5.4.4.xcframework.zip",
   "5.4.3": "https://github.com/adjust/ios_sdk/releases/download/v5.4.3/AdjustSdk-iMessage-Static-5.4.3.xcframework.zip",
   "5.4.2": "https://github.com/adjust/ios_sdk/releases/download/v5.4.2/AdjustSdk-iMessage-Static-5.4.2.xcframework.zip",
diff --git a/Carthage/AdjustSdkWebBridge-Dynamic.json b/Carthage/AdjustSdkWebBridge-Dynamic.json
@@ -1,4 +1,5 @@
 {
+  "5.4.5": "https://github.com/adjust/ios_sdk/releases/download/v5.4.5/AdjustSdk-WebBridge-Dynamic-5.4.5.xcframework.zip",
   "5.4.4": "https://github.com/adjust/ios_sdk/releases/download/v5.4.4/AdjustSdk-WebBridge-Dynamic-5.4.4.xcframework.zip",
   "5.4.3": "https://github.com/adjust/ios_sdk/releases/download/v5.4.3/AdjustSdk-WebBridge-Dynamic-5.4.3.xcframework.zip",
   "5.4.2": "https://github.com/adjust/ios_sdk/releases/download/v5.4.2/AdjustSdk-WebBridge-Dynamic-5.4.2.xcframework.zip",
diff --git a/Carthage/AdjustSdkWebBridge-Static.json b/Carthage/AdjustSdkWebBridge-Static.json
@@ -1,4 +1,5 @@
 {
+  "5.4.5": "https://github.com/adjust/ios_sdk/releases/download/v5.4.5/AdjustSdk-WebBridge-Static-5.4.5.xcframework.zip",
   "5.4.4": "https://github.com/adjust/ios_sdk/releases/download/v5.4.4/AdjustSdk-WebBridge-Static-5.4.4.xcframework.zip",
   "5.4.3": "https://github.com/adjust/ios_sdk/releases/download/v5.4.3/AdjustSdk-WebBridge-Static-5.4.3.xcframework.zip",
   "5.4.2": "https://github.com/adjust/ios_sdk/releases/download/v5.4.2/AdjustSdk-WebBridge-Static-5.4.2.xcframework.zip",
diff --git a/Package.swift b/Package.swift
@@ -16,7 +16,7 @@ let package = Package(
         ),
         .package(
             url: "https://github.com/googleads/google-ads-on-device-conversion-ios-sdk.git",
-            from: "2.0.0"
+            "2.0.0"..<"4.0.0"
         )
     ],
     targets: [
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.4.4
+5.4.5
diff --git a/scripts/carthage_xcode.sh b/scripts/carthage_xcode.sh
@@ -16,6 +16,11 @@ echo "EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x8
 echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_'${CURRENT_XCODE_VERSION}' = $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_$(XCODE_VERSION_MAJOR)__BUILD_$(XCODE_PRODUCT_BUILD_VERSION))' >> $xcconfig
 echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig
 
+# Generic fallbacks to handle newer Xcode versions.
+# Always exclude arm64 from simulator SDKs to avoid fat binary conflicts when merging device (arm64) and simulator slices.
+echo 'EXCLUDED_ARCHS[sdk=iphonesimulator*] = $(inherited) arm64' >> $xcconfig
+echo 'EXCLUDED_ARCHS[sdk=appletvsimulator*] = $(inherited) arm64' >> $xcconfig
+
 export XCODE_XCCONFIG_FILE="$xcconfig"
 carthage "$@"
 

Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,8 @@ - (id _Nullable)initIfPluginAvailbleAndFetchOdmData {`
`41`	`41`	`[_logger verbose:@"GoogleAdsOnDeviceConversion framework version %@ successfully found in the app", [ADJOdmManager odmFrameworkVersion]];`
`42`	`42`	`isOdmAvailable = YES;`
`43`	`43`	`} else {`
`44`		`- [_logger warn:@"%@", error];`
`45`		`- [_logger warn:@"ADJOdmPlugin can not be initialized"];`
	`44`	`+ [_logger error:@"ADJOdmPlugin can not be initialized. Error: %@", error];`
`46`	`45`	`}`
`47`		`- } else {`
`48`		`- [_logger warn:@"ADJOdmPlugin can not be initialized"];`
`49`	`46`	`}`
`50`	`47`
`51`	`48`	`if (!isOdmAvailable) {`
`@@ -171,7 +168,7 @@ - (void)completeProcessingOdmInfoWithSuccess:(BOOL)success {`
`171`	`168`	`// Update UserDefaults in case odmInfo was processed successfully.`
`172`	`169`	`if (success) {`
`173`	`170`	`[ADJUserDefaults setGoogleOdmInfoProcessed];`
`174`		`- [self.logger warn:@"GoogleAdsOnDeviceConversion info has been processed"];`
	`171`	`+ [self.logger verbose:@"GoogleAdsOnDeviceConversion info has been processed"];`
`175`	`172`	`}`
`176`	`173`	`});`
`177`	`174`	`}`
`@@ -181,7 +178,7 @@ - (void)completeProcessingOdmInfoWithSuccess:(BOOL)success {`
`181`	`178`	`+ (BOOL)isOdmPluginAvailable {`
`182`	`179`	`Class odmPluginClass = NSClassFromString(@"ADJOdmPlugin");`
`183`	`180`	`if (odmPluginClass == nil) {`
`184`		`- [[ADJAdjustFactory logger] error:@"ADJOdmPlugin class not found"];`
	`181`	`+ [[ADJAdjustFactory logger] verbose:@"ADJOdmPlugin class not found"];`
`185`	`182`	`return NO;`
`186`	`183`	`}`
`187`	`184`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ function canSend(okCheck, errReason) {`
`176`	`176`	`if (this.sdkPrefix) {`
`177`	`177`	`return this.sdkPrefix;`
`178`	`178`	`} else {`
`179`		`- return 'web-bridge5.4.4';`
	`179`	`+ return 'web-bridge5.4.5';`
`180`	`180`	`}`
`181`	`181`	`},`
`182`	`182`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "5.4.5": "https://github.com/adjust/ios_sdk/releases/download/v5.4.5/AdjustSdk-iOS-tvOS-Dynamic-5.4.5.xcframework.zip",`
`2`	`3`	`"5.4.4": "https://github.com/adjust/ios_sdk/releases/download/v5.4.4/AdjustSdk-iOS-tvOS-Dynamic-5.4.4.xcframework.zip",`
`3`	`4`	`"5.4.3": "https://github.com/adjust/ios_sdk/releases/download/v5.4.3/AdjustSdk-iOS-tvOS-Dynamic-5.4.3.xcframework.zip",`
`4`	`5`	`"5.4.2": "https://github.com/adjust/ios_sdk/releases/download/v5.4.2/AdjustSdk-iOS-tvOS-Dynamic-5.4.2.xcframework.zip",`