Merge pull request #648 from adjust/v4333

Version 4.33.3
adjust · Dec 29, 2022 · 85f1ac8 · 85f1ac8
2 parents 9d3f624 + e340bb1
commit 85f1ac8
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 7 deletions.
diff --git a/Adjust.podspec b/Adjust.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name           = "Adjust"
-  s.version        = "4.33.2"
+  s.version        = "4.33.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' }
   s.author         = { "Adjust GmbH" => "[email protected]" }
-  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.33.2" }
+  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.33.3" }
   s.ios.deployment_target = '9.0'
   s.tvos.deployment_target = '9.0'
   s.framework      = 'SystemConfiguration'

diff --git a/Adjust/ADJSKAdNetwork.m b/Adjust/ADJSKAdNetwork.m
@@ -198,6 +198,7 @@ - (void)adjUpdateConversionValue:(NSInteger)conversionValue
 #pragma mark - Private
 
 - (BOOL)isApiAvailableForClass:(Class)class andSelector:(SEL)selector {
+#if !(TARGET_OS_TV)
     if (class == nil) {
         [self.logger warn:@"StoreKit.framework not found in the app (SKAdNetwork class not found)"];
         return NO;
@@ -211,6 +212,10 @@ - (BOOL)isApiAvailableForClass:(Class)class andSelector:(SEL)selector {
         return NO;
     }
     return YES;
+#else
+    [self.logger debug:@"%@ method implementation not available for tvOS platform", NSStringFromSelector(selector)];
+    return NO;
+#endif
 }
 
 - (void)writeSkAdNetworkRegisterCallTimestamp {
@@ -219,6 +224,7 @@ - (void)writeSkAdNetworkRegisterCallTimestamp {
 }
 
 - (NSString *)getSkAdNetworkCoarseConversionValue:(NSString *)adjustCoarseValue {
+#if !(TARGET_OS_TV)
     if (@available(iOS 16.1, *)) {
         if ([adjustCoarseValue isEqualToString:@"low"]) {
             NSString * __autoreleasing *lowValue = (NSString * __autoreleasing *)dlsym(RTLD_DEFAULT, "SKAdNetworkCoarseConversionValueLow");
@@ -235,6 +241,9 @@ - (NSString *)getSkAdNetworkCoarseConversionValue:(NSString *)adjustCoarseValue
     } else {
         return nil;
     }
+#else
+    return nil;
+#endif
 }
 
 - (Class)getSKAdNetworkClass {

diff --git a/Adjust/ADJUtil.m b/Adjust/ADJUtil.m
@@ -39,7 +39,7 @@
 static NSRegularExpression *shortUniversalLinkRegex = nil;
 static NSRegularExpression *excludedDeeplinkRegex = nil;
 
-static NSString * const kClientSdk                  = @"ios4.33.2";
+static NSString * const kClientSdk                  = @"ios4.33.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.33.2
+//  V4.33.3
 //  Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
 //  Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
 //

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.33.2';
+                    return 'web-bridge4.33.3';
                 }
             },
             setTestOptions: function(testOptions) {

diff --git a/AdjustTests/AdjustUnitTests/ADJPackageFields.m b/AdjustTests/AdjustUnitTests/ADJPackageFields.m
@@ -16,7 +16,7 @@ - (id) init {
 
     // default values
     self.appToken = @"qwerty123456";
-    self.clientSdk = @"ios4.33.2";
+    self.clientSdk = @"ios4.33.3";
     self.suffix = @"";
     self.environment = @"sandbox";
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### Version 4.33.3 (29th December 2022)
+#### Fixed
+- Excluded SKAdNetwork flow from being executed on tvOS target (https://github.com/adjust/ios_sdk/issues/647).
+
+---
+
 ### Version 4.33.2 (6th December 2022)
 #### Fixed
 - Added additional checks to make sure that non-existing selectors for given platform don't attempt to be executed (https://github.com/adjust/ios_sdk/issues/641).

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.33.2
+4.33.3
diff --git a/examples/AdjustExample-tvOS/AdjustExample-tvOS.xcodeproj/project.pbxproj b/examples/AdjustExample-tvOS/AdjustExample-tvOS.xcodeproj/project.pbxproj
@@ -46,6 +46,7 @@
 		9D449F5D1E6EE6C500E7E80B /* Adjust.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D449F3B1E6EE6C500E7E80B /* Adjust.m */; };
 		9D449F5E1E6EE6C500E7E80B /* ADJUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D449F3D1E6EE6C500E7E80B /* ADJUtil.m */; };
 		9D49D171290FEBFC00042345 /* ADJSKAdNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D49D170290FEBFC00042345 /* ADJSKAdNetwork.m */; };
+		9D5C9632295D96260021602B /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D5C9631295D96260021602B /* StoreKit.framework */; };
 		9DC95F2F1C10596500138E4B /* Constants.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DC95F2E1C10596500138E4B /* Constants.m */; };
 		9DD0E9CF1F459ECE00B2A759 /* ADJUserDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DD0E9CE1F459ECE00B2A759 /* ADJUserDefaults.m */; };
 		9DF3823D260E9E000033F5A1 /* NSNumber+ADJAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DF3823C260E9E000033F5A1 /* NSNumber+ADJAdditions.m */; };
@@ -142,6 +143,7 @@
 		9D449F3D1E6EE6C500E7E80B /* ADJUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJUtil.m; sourceTree = "<group>"; };
 		9D49D16F290FEBFC00042345 /* ADJSKAdNetwork.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJSKAdNetwork.h; sourceTree = "<group>"; };
 		9D49D170290FEBFC00042345 /* ADJSKAdNetwork.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJSKAdNetwork.m; sourceTree = "<group>"; };
+		9D5C9631295D96260021602B /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
 		9DC95F2D1C10596500138E4B /* Constants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Constants.h; sourceTree = "<group>"; };
 		9DC95F2E1C10596500138E4B /* Constants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Constants.m; sourceTree = "<group>"; };
 		9DD0E9CD1F459ECE00B2A759 /* ADJUserDefaults.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJUserDefaults.h; sourceTree = "<group>"; };
@@ -158,6 +160,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				963909D01BCC0DA600A2E8A4 /* AdSupport.framework in Frameworks */,
+				9D5C9632295D96260021602B /* StoreKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -169,6 +172,7 @@
 			children = (
 				963909B41BCC0D8300A2E8A4 /* AdjustExample-tvOS */,
 				963909B31BCC0D8300A2E8A4 /* Products */,
+				9D5C9630295D96250021602B /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -295,6 +299,14 @@
 			path = ADJAdditions;
 			sourceTree = "<group>";
 		};
+		9D5C9630295D96250021602B /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				9D5C9631295D96260021602B /* StoreKit.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		9DF7ACCA1CB50DB700D3591F /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (