diff --git a/Adjust.podspec b/Adjust.podspec index 7f749faca..0e5b3b10c 100644 --- 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 index 16e08841c..e152cf9ee 100644 --- 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 index 84ded4f09..0a43946be 100644 --- 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 index aabc3a3e5..778001413 100644 --- 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 index 0f5737eea..724e1c160 100644 --- 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 index 83d12ad3c..8607c061d 100644 --- 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 index 78f75c7c4..8345f6b55 100644 --- 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 index a96edd956..0d9a71161 100644 --- 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 index a9fd0e0d7..49d14250c 100644 --- 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 index 621c06e22..4efc06d6d 100644 --- 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 index 04c217b8c..594cef565 100644 --- 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 index 5b2661979..81ab4f686 100644 --- 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 index 8e46fb941..0e3f5f484 100644 --- 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 index 426c1c179..8ce222e90 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.4.4 +5.4.5 diff --git a/scripts/carthage_xcode.sh b/scripts/carthage_xcode.sh index 4369c2a87..f7df7b58a 100755 --- 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 "$@"