Merge pull request #633 from adjust/v4321

Version 4.32.1

Author: uerceg

Adjust.podspec

@@ -1,15 +1,15 @@
 Pod::Spec.new do |s|
   s.name           = "Adjust"
-  s.version        = "4.32.0"
+  s.version        = "4.32.1"
   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.32.0" }
+  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.32.1" }
   s.ios.deployment_target = '9.0'
   s.tvos.deployment_target = '9.0'
   s.framework      = 'SystemConfiguration'
-  s.ios.weak_framework = 'AdSupport', 'iAd', 'CoreTelephony'
+  s.ios.weak_framework = 'AdSupport', 'iAd'
   s.tvos.weak_framework = 'AdSupport'
   s.requires_arc   = true
   s.default_subspec = 'Core'

Adjust/ADJUtil.m

@@ -39,7 +39,7 @@
 static NSRegularExpression *shortUniversalLinkRegex = nil;
 static NSRegularExpression *excludedDeeplinkRegex = nil;
 
-static NSString * const kClientSdk                  = @"ios4.32.0";
+static NSString * const kClientSdk                  = @"ios4.32.1";
 static NSString * const kDeeplinkParam              = @"deep_link=";
 static NSString * const kSchemeDelimiter            = @"://";
 static NSString * const kDefaultScheme              = @"AdjustUniversalScheme";
@@ -332,15 +332,17 @@ + (void)writeObject:(id)object
             }
 
             if (@available(iOS 11.0, tvOS 11.0, *)) {
-                NSError *errorArchiving = nil;
-                // API introduced in iOS 11.
-                NSData *data = [NSKeyedArchiver archivedDataWithRootObject:object requiringSecureCoding:NO error:&errorArchiving];
-                if (data && errorArchiving == nil) {
-                    NSError *errorWriting = nil;
-                    result = [data writeToFile:filePath options:NSDataWritingAtomic error:&errorWriting];
-                    result = result && (errorWriting == nil);
-                } else {
-                    result = NO;
+                @autoreleasepool {
+                    NSError *errorArchiving = nil;
+                    // API introduced in iOS 11.
+                    NSData *data = [NSKeyedArchiver archivedDataWithRootObject:object requiringSecureCoding:NO error:&errorArchiving];
+                    if (data && errorArchiving == nil) {
+                        NSError *errorWriting = nil;
+                        result = [data writeToFile:filePath options:NSDataWritingAtomic error:&errorWriting];
+                        result = result && (errorWriting == nil);
+                    } else {
+                        result = NO;
+                    }
                 }
             } else {
                 // API_DEPRECATED [2.0-12.0]

Adjust/Adjust.h

@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust SDK
 //
-//  V4.32.0
+//  V4.32.1
 //  Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
 //  Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
 //

AdjustBridge/AdjustBridgeRegister.m

@@ -256,7 +256,7 @@ + (NSString *)adjust_js {
                 if (this.sdkPrefix) {
                     return this.sdkPrefix;
                 } else {
-                    return 'web-bridge4.32.0';
+                    return 'web-bridge4.32.1';
                 }
             },
             setTestOptions: function(testOptions) {

AdjustBridge/WebViewJavascriptBridge/WKWebViewJavascriptBridge.m

@@ -107,6 +107,14 @@ - (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigat
     }
 }
 
+- (void)webView:(WKWebView *)webView didCommitNavigation:(WKNavigation *)navigation {
+    if (webView != _webView) { return; }
+
+    __strong typeof(_webViewDelegate) strongDelegate = _webViewDelegate;
+    if (strongDelegate && [strongDelegate respondsToSelector:@selector(webView:didCommitNavigation:)]) {
+        [strongDelegate webView:webView didCommitNavigation:navigation];
+    }
+}
 
 - (void)webView:(WKWebView *)webView decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse decisionHandler:(void (^)(WKNavigationResponsePolicy))decisionHandler {
     if (webView != _webView) { return; }

AdjustTests/AdjustTestLibrary/AdjustTestLibrary.xcodeproj/project.pbxproj

@@ -310,7 +310,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "set -e\n\nexport FRAMEWORK_LOCN=\"${BUILT_PRODUCTS_DIR}/Static/${PRODUCT_NAME}.framework\"\n\n# Create the path to the real Headers die\nmkdir -p \"${FRAMEWORK_LOCN}/Versions/A/Headers\"\n\n# Create the required symlinks\n/bin/ln -sfh A \"${FRAMEWORK_LOCN}/Versions/Current\"\n/bin/ln -sfh Versions/Current/Headers \"${FRAMEWORK_LOCN}/Headers\"\n/bin/ln -sfh \"Versions/Current/${PRODUCT_NAME}\" \\\n\"${FRAMEWORK_LOCN}/${PRODUCT_NAME}\"\n\n# Copy the public headers into the framework\n/bin/cp -a \"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}/\" \\\n\"${FRAMEWORK_LOCN}/Versions/A/Headers\"\n";
+			shellScript = "set -e\n\nexport FRAMEWORK_LOCN=\"${BUILT_PRODUCTS_DIR}/Static/${PRODUCT_NAME}.framework\"\n\n# Create the path to the real Headers die\nmkdir -p \"${FRAMEWORK_LOCN}/Versions/A/Headers\"\n\n# Create the required symlinks\n/bin/ln -sfh A \"${FRAMEWORK_LOCN}/Versions/Current\"\n/bin/ln -sfh Versions/Current/Headers \"${FRAMEWORK_LOCN}/Headers\"\n/bin/ln -sfh \"Versions/Current/${PRODUCT_NAME}\" \\\n\"${FRAMEWORK_LOCN}/${PRODUCT_NAME}\"\n\n# Copy the public headers into the framework\n/bin/cp -a \"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}/\" \\\n\"${FRAMEWORK_LOCN}/Versions/A/Headers\"\n\n# Copy the framework to the project directory\nditto \"${FRAMEWORK_LOCN}\" \"${SRCROOT}/../../Frameworks/static/${PRODUCT_NAME}.framework\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 

AdjustTests/AdjustUnitTests/ADJPackageFields.m

@@ -16,7 +16,7 @@ - (id) init {
 
     // default values
     self.appToken = @"qwerty123456";
-    self.clientSdk = @"ios4.32.0";
+    self.clientSdk = @"ios4.32.1";
     self.suffix = @"";
     self.environment = @"sandbox";
 

CHANGELOG.md

@@ -1,3 +1,10 @@
+### Version 4.32.1 (26th September 2022)
+#### Fixed
+- Fixed memory issue when continuously writing to a file (https://github.com/adjust/ios_sdk/pull/626).
+- Added missing `WKNavigationDelegate`'s missing `didCommitNavigation` method handling inside of the `WKWebViewJavascriptBridge` (https://github.com/adjust/ios_sdk/pull/570).
+
+---
+
 ### Version 4.32.0 (7th September 2022)
 #### Added
 - Added partner sharing settings to the third party sharing feature.

VERSION

@@ -1 +1 @@
-4.32.0
+4.32.1

scripts/build_definitions.sh

@@ -181,8 +181,8 @@ Usage: $0 [options]
 	XCF_FRM_ZIP_NAME__TV_STATIC="AdjustSdk-tvOS-Static"
 	XCF_FRM_ZIP_NAME__IM_DYNAMIC="AdjustSdk-iMessage-Dynamic"
 	XCF_FRM_ZIP_NAME__IM_STATIC="AdjustSdk-iMessage-Static"
-	XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC="AdjustSdk-WebBridge-iOS-Dynamic"
-	XCF_FRM_ZIP_NAME__WEB_BRIDGE_STATIC="AdjustSdk-WebBridge-iOS-Static"
+	XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC="AdjustSdk-WebBridge-Dynamic"
+	XCF_FRM_ZIP_NAME__WEB_BRIDGE_STATIC="AdjustSdk-WebBridge-Static"
 
 
 	# previous builds artefacts cleanup 
@@ -237,8 +237,7 @@ Usage: $0 [options]
 	  local output_file="$3"
 
 	  cd "$input_folder"
-	  zip -r -X "$output_file" "$input_file"
-	  rm -rf "$input_file"
+	  zip -r -X -y "$output_file" "$input_file"
 	  cd -
 	}
 
@@ -254,6 +253,8 @@ Usage: $0 [options]
 	  XCODE12PLUS=1
 	fi
 
+	SDK_VERSION=$(head -n 1 VERSION)
+	echo "$SDK_VERSION"
 
 	# Build, Lipo an Zip framework function
 	function build_static_fat_framework() {
@@ -334,9 +335,10 @@ Usage: $0 [options]
 	  fi
 
 	  cd "$build_root_folder/$target_scheme/universal"
-	  zip -r -X "$zip_file_name" "$framework_name.framework"
+	  zip -r -X -y "$zip_file_name" "$framework_name.framework"
 	  cd -
 	  mv "$build_root_folder/$target_scheme/universal/$zip_file_name" "$output_folder"
+	  mv "$build_root_folder/$target_scheme/universal/$framework_name.framework" "$output_folder"
 	  rm -rf "$build_root_folder/$target_scheme"
 
 	}