From b904d85ce338d3a846e498cd5e44f09d6189b716 Mon Sep 17 00:00:00 2001 From: Genady Buchatsky Date: Thu, 8 Sep 2022 10:46:34 +0200 Subject: [PATCH 01/14] build: fix output WebBridge frameworks naming --- scripts/build_definitions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build_definitions.sh b/scripts/build_definitions.sh index d1da93aaf..3bf29fa36 100755 --- a/scripts/build_definitions.sh +++ b/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 From 662f5486fafe5c44b6d265daeedf4fb96fee8ac5 Mon Sep 17 00:00:00 2001 From: Genady Buchatsky Date: Mon, 12 Sep 2022 13:52:31 +0200 Subject: [PATCH 02/14] build: fix output dynamic frameworks zip file names --- scripts/dynamic_frameworks.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/dynamic_frameworks.sh b/scripts/dynamic_frameworks.sh index eb4e515dd..f826989b6 100755 --- a/scripts/dynamic_frameworks.sh +++ b/scripts/dynamic_frameworks.sh @@ -38,9 +38,9 @@ then echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Move Carthage generated dynamic iOS SDK framework to destination folder ... ${NC}" cd "Carthage/Build" mv "iOS" "${XCF_FRM_ZIP_NAME__IOS_DYNAMIC}" - zip -r -X "${XCF_FRM_ZIP_NAME__IOS_DYNAMIC}.zip" "${XCF_FRM_ZIP_NAME__IOS_DYNAMIC}" + zip -r -X "${XCF_FRM_ZIP_NAME__IOS_DYNAMIC}.framework.zip" "${XCF_FRM_ZIP_NAME__IOS_DYNAMIC}" cd - - mv "Carthage/Build/${XCF_FRM_ZIP_NAME__IOS_DYNAMIC}.zip" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" + mv "Carthage/Build/${XCF_FRM_ZIP_NAME__IOS_DYNAMIC}.framework.zip" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Done! ${NC}" else echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Skipping iOS SDK framework build ... ${NC}" @@ -66,9 +66,9 @@ then echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Move Carthage generated dynamic tvOS SDK framework to destination folder ... ${NC}" cd "Carthage/Build" mv "tvOS" "${XCF_FRM_ZIP_NAME__TV_DYNAMIC}" - zip -r -X "${XCF_FRM_ZIP_NAME__TV_DYNAMIC}.zip" "${XCF_FRM_ZIP_NAME__TV_DYNAMIC}" + zip -r -X "${XCF_FRM_ZIP_NAME__TV_DYNAMIC}.framework.zip" "${XCF_FRM_ZIP_NAME__TV_DYNAMIC}" cd - - mv "Carthage/Build/${XCF_FRM_ZIP_NAME__TV_DYNAMIC}.zip" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" + mv "Carthage/Build/${XCF_FRM_ZIP_NAME__TV_DYNAMIC}.framework.zip" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Done! ${NC}" else echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Skipping tvOS SDK framework build ... ${NC}" @@ -95,9 +95,9 @@ then echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Move Carthage generated dynamic iMessage SDK framework to destination folder ... ${NC}" cd "Carthage/Build" mv "iOS" "${XCF_FRM_ZIP_NAME__IM_DYNAMIC}" - zip -r -X "${XCF_FRM_ZIP_NAME__IM_DYNAMIC}.zip" "${XCF_FRM_ZIP_NAME__IM_DYNAMIC}" + zip -r -X "${XCF_FRM_ZIP_NAME__IM_DYNAMIC}.framework.zip" "${XCF_FRM_ZIP_NAME__IM_DYNAMIC}" cd - - mv "Carthage/Build/${XCF_FRM_ZIP_NAME__IM_DYNAMIC}.zip" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" + mv "Carthage/Build/${XCF_FRM_ZIP_NAME__IM_DYNAMIC}.framework.zip" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Done! ${NC}" else echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Skipping iMessage SDK framework build ... ${NC}" @@ -124,9 +124,9 @@ then echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Move Carthage generated dynamic WebBridge SDK framework to destination folder ... ${NC}" cd "Carthage/Build" mv "iOS" "${XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC}" - zip -r -X "${XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC}.zip" "${XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC}" + zip -r -X "${XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC}.framework.zip" "${XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC}" cd - - mv "Carthage/Build/${XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC}.zip" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" + mv "Carthage/Build/${XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC}.framework.zip" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Done! ${NC}" else echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Skipping WebBridge SDK framework build ... ${NC}" From eb9330bbd91e3950baf92830eb9c9c0b92051611 Mon Sep 17 00:00:00 2001 From: Genady Buchatsky Date: Fri, 16 Sep 2022 00:02:24 +0200 Subject: [PATCH 03/14] build: output - put unzipped (xc)frameworks next to zipped ones --- scripts/build_definitions.sh | 2 +- scripts/dynamic_frameworks.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/build_definitions.sh b/scripts/build_definitions.sh index 3bf29fa36..a8cade965 100755 --- a/scripts/build_definitions.sh +++ b/scripts/build_definitions.sh @@ -238,7 +238,6 @@ Usage: $0 [options] cd "$input_folder" zip -r -X "$output_file" "$input_file" - rm -rf "$input_file" cd - } @@ -337,6 +336,7 @@ Usage: $0 [options] zip -r -X "$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" } diff --git a/scripts/dynamic_frameworks.sh b/scripts/dynamic_frameworks.sh index f826989b6..e731ee1a4 100755 --- a/scripts/dynamic_frameworks.sh +++ b/scripts/dynamic_frameworks.sh @@ -41,6 +41,7 @@ then zip -r -X "${XCF_FRM_ZIP_NAME__IOS_DYNAMIC}.framework.zip" "${XCF_FRM_ZIP_NAME__IOS_DYNAMIC}" cd - mv "Carthage/Build/${XCF_FRM_ZIP_NAME__IOS_DYNAMIC}.framework.zip" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" + mv "Carthage/Build/${XCF_FRM_ZIP_NAME__IOS_DYNAMIC}" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Done! ${NC}" else echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Skipping iOS SDK framework build ... ${NC}" @@ -69,6 +70,7 @@ then zip -r -X "${XCF_FRM_ZIP_NAME__TV_DYNAMIC}.framework.zip" "${XCF_FRM_ZIP_NAME__TV_DYNAMIC}" cd - mv "Carthage/Build/${XCF_FRM_ZIP_NAME__TV_DYNAMIC}.framework.zip" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" + mv "Carthage/Build/${XCF_FRM_ZIP_NAME__TV_DYNAMIC}" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Done! ${NC}" else echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Skipping tvOS SDK framework build ... ${NC}" @@ -98,6 +100,7 @@ then zip -r -X "${XCF_FRM_ZIP_NAME__IM_DYNAMIC}.framework.zip" "${XCF_FRM_ZIP_NAME__IM_DYNAMIC}" cd - mv "Carthage/Build/${XCF_FRM_ZIP_NAME__IM_DYNAMIC}.framework.zip" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" + mv "Carthage/Build/${XCF_FRM_ZIP_NAME__IM_DYNAMIC}" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Done! ${NC}" else echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Skipping iMessage SDK framework build ... ${NC}" @@ -127,6 +130,7 @@ then zip -r -X "${XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC}.framework.zip" "${XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC}" cd - mv "Carthage/Build/${XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC}.framework.zip" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" + mv "Carthage/Build/${XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC}" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Done! ${NC}" else echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Skipping WebBridge SDK framework build ... ${NC}" From d7cd53dd3a964b4795f93e4b39b0269b265d114f Mon Sep 17 00:00:00 2001 From: Genady Buchatsky Date: Mon, 26 Sep 2022 11:23:32 +0200 Subject: [PATCH 04/14] build: fixes symlinks in zipped static (xc)frameworks --- scripts/build_definitions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build_definitions.sh b/scripts/build_definitions.sh index a8cade965..0935a1cc2 100755 --- a/scripts/build_definitions.sh +++ b/scripts/build_definitions.sh @@ -237,7 +237,7 @@ Usage: $0 [options] local output_file="$3" cd "$input_folder" - zip -r -X "$output_file" "$input_file" + zip -r -X -y "$output_file" "$input_file" cd - } @@ -333,7 +333,7 @@ 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" From 2f488f5bfe94c4b2f0bbade5fc9752c253078503 Mon Sep 17 00:00:00 2001 From: huiping_guo Date: Thu, 10 Mar 2022 14:15:57 +0900 Subject: [PATCH 05/14] =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E9=80=A3=E7=B6=9A=E6=9B=B8=E3=81=8D=E8=BE=BC=E3=81=BF=E6=99=82?= =?UTF-8?q?=E3=81=AB=E3=83=A1=E3=83=A2=E3=83=AA=E3=83=BC=E8=A7=A3=E6=B6=88?= =?UTF-8?q?=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Adjust/ADJUtil.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Adjust/ADJUtil.m b/Adjust/ADJUtil.m index 7704a154c..863c214b2 100644 --- a/Adjust/ADJUtil.m +++ b/Adjust/ADJUtil.m @@ -332,6 +332,7 @@ + (void)writeObject:(id)object } if (@available(iOS 11.0, tvOS 11.0, *)) { + @autoreleasepool { NSError *errorArchiving = nil; // API introduced in iOS 11. NSData *data = [NSKeyedArchiver archivedDataWithRootObject:object requiringSecureCoding:NO error:&errorArchiving]; @@ -342,6 +343,7 @@ + (void)writeObject:(id)object } else { result = NO; } + } } else { // API_DEPRECATED [2.0-12.0] // Use +archivedDataWithRootObject:requiringSecureCoding:error: and -writeToURL:options:error: instead From eaaf7cf222018d3905b0ebca3ef3b68d4c8d1c31 Mon Sep 17 00:00:00 2001 From: Cristian Ortega Date: Thu, 30 Sep 2021 10:28:00 +0200 Subject: [PATCH 06/14] Add missing didCommit method to WKWebViewJavascriptBridge --- .../WebViewJavascriptBridge/WKWebViewJavascriptBridge.m | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/AdjustBridge/WebViewJavascriptBridge/WKWebViewJavascriptBridge.m b/AdjustBridge/WebViewJavascriptBridge/WKWebViewJavascriptBridge.m index 6f3e6b3a7..6e5d34bce 100644 --- a/AdjustBridge/WebViewJavascriptBridge/WKWebViewJavascriptBridge.m +++ b/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; } From 4064d4556e23c5eb05e2dad5fa77322873946d28 Mon Sep 17 00:00:00 2001 From: Cristian Ortega Date: Thu, 30 Sep 2021 10:52:03 +0200 Subject: [PATCH 07/14] Remove unwanted semicolon --- .../WebViewJavascriptBridge/WKWebViewJavascriptBridge.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AdjustBridge/WebViewJavascriptBridge/WKWebViewJavascriptBridge.m b/AdjustBridge/WebViewJavascriptBridge/WKWebViewJavascriptBridge.m index 6e5d34bce..e0392179c 100644 --- a/AdjustBridge/WebViewJavascriptBridge/WKWebViewJavascriptBridge.m +++ b/AdjustBridge/WebViewJavascriptBridge/WKWebViewJavascriptBridge.m @@ -111,7 +111,7 @@ - (void)webView:(WKWebView *)webView didCommitNavigation:(WKNavigation *)navigat if (webView != _webView) { return; } __strong typeof(_webViewDelegate) strongDelegate = _webViewDelegate; - if (strongDelegate && [strongDelegate respondsToSelector:@selector(webView:didCommitNavigation::)]) { + if (strongDelegate && [strongDelegate respondsToSelector:@selector(webView:didCommitNavigation:)]) { [strongDelegate webView:webView didCommitNavigation:navigation]; } } From 8523475dec6bc745827babaee8564e97ec8eb311 Mon Sep 17 00:00:00 2001 From: uerceg Date: Fri, 23 Sep 2022 13:03:43 +0200 Subject: [PATCH 08/14] feat: update version number to 4.32.1 --- Adjust.podspec | 4 ++-- Adjust/ADJUtil.m | 2 +- Adjust/Adjust.h | 2 +- AdjustBridge/AdjustBridgeRegister.m | 2 +- AdjustTests/AdjustUnitTests/ADJPackageFields.m | 2 +- VERSION | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Adjust.podspec b/Adjust.podspec index c80f4195a..05543cee4 100644 --- a/Adjust.podspec +++ b/Adjust.podspec @@ -1,11 +1,11 @@ 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" => "sdk@adjust.com" } - 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' diff --git a/Adjust/ADJUtil.m b/Adjust/ADJUtil.m index 863c214b2..46d2dfef0 100644 --- 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.32.0"; +static NSString * const kClientSdk = @"ios4.32.1"; 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 index 95d3a28cf..64a5a12e6 100644 --- a/Adjust/Adjust.h +++ b/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. // diff --git a/AdjustBridge/AdjustBridgeRegister.m b/AdjustBridge/AdjustBridgeRegister.m index e4984ec35..a4949f564 100644 --- a/AdjustBridge/AdjustBridgeRegister.m +++ b/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) { diff --git a/AdjustTests/AdjustUnitTests/ADJPackageFields.m b/AdjustTests/AdjustUnitTests/ADJPackageFields.m index 8fa750684..8ba5ef397 100644 --- a/AdjustTests/AdjustUnitTests/ADJPackageFields.m +++ b/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"; diff --git a/VERSION b/VERSION index eed4df592..f4bdd8add 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.32.0 +4.32.1 From e0354d740ad4037a57785cd77faf37fec5207852 Mon Sep 17 00:00:00 2001 From: uerceg Date: Fri, 23 Sep 2022 13:08:41 +0200 Subject: [PATCH 09/14] chore: remove unused framework from podspec file --- Adjust.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Adjust.podspec b/Adjust.podspec index 05543cee4..77ece8fb9 100644 --- a/Adjust.podspec +++ b/Adjust.podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |s| 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' From a44b88303307066db219e719b5bdae915b6a27f1 Mon Sep 17 00:00:00 2001 From: uerceg Date: Fri, 23 Sep 2022 13:16:34 +0200 Subject: [PATCH 10/14] style: fix indentation from public PR commit --- Adjust/ADJUtil.m | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Adjust/ADJUtil.m b/Adjust/ADJUtil.m index 46d2dfef0..05fd47b7c 100644 --- a/Adjust/ADJUtil.m +++ b/Adjust/ADJUtil.m @@ -332,18 +332,18 @@ + (void)writeObject:(id)object } if (@available(iOS 11.0, tvOS 11.0, *)) { - @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; + @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] // Use +archivedDataWithRootObject:requiringSecureCoding:error: and -writeToURL:options:error: instead From 80f4f13e64dffcf70c3f24c8b784fd379acb122d Mon Sep 17 00:00:00 2001 From: uerceg Date: Mon, 26 Sep 2022 13:00:29 +0200 Subject: [PATCH 11/14] docs: update CHANGELOG --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c0bd5a98..120a9faa5 100644 --- a/CHANGELOG.md +++ b/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. From f280268b272675d079e5b1ab3ad7a15208a6a329 Mon Sep 17 00:00:00 2001 From: uerceg Date: Mon, 26 Sep 2022 13:11:20 +0200 Subject: [PATCH 12/14] fix: make sure test library always gets updated in output directory --- .../AdjustTestLibrary.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AdjustTests/AdjustTestLibrary/AdjustTestLibrary.xcodeproj/project.pbxproj b/AdjustTests/AdjustTestLibrary/AdjustTestLibrary.xcodeproj/project.pbxproj index 08cc058d1..f76bf0d86 100644 --- a/AdjustTests/AdjustTestLibrary/AdjustTestLibrary.xcodeproj/project.pbxproj +++ b/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 */ From 3316f8bb5bf66f6d32b3e7fdd5ed91e66458f655 Mon Sep 17 00:00:00 2001 From: Genady Buchatsky Date: Mon, 26 Sep 2022 16:21:57 +0200 Subject: [PATCH 13/14] build: Adds VERSION to (xc)frameworks zip file names Fixes [SDK-1582] --- scripts/build_definitions.sh | 2 ++ scripts/dynamic_frameworks.sh | 16 ++++++++-------- scripts/dynamic_xcframeworks.sh | 8 ++++---- scripts/static_frameworks.sh | 8 ++++---- scripts/static_xcframeworks.sh | 8 ++++---- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/scripts/build_definitions.sh b/scripts/build_definitions.sh index 0935a1cc2..5ccbcc74a 100755 --- a/scripts/build_definitions.sh +++ b/scripts/build_definitions.sh @@ -253,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() { diff --git a/scripts/dynamic_frameworks.sh b/scripts/dynamic_frameworks.sh index e731ee1a4..d3c9532e0 100755 --- a/scripts/dynamic_frameworks.sh +++ b/scripts/dynamic_frameworks.sh @@ -38,9 +38,9 @@ then echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Move Carthage generated dynamic iOS SDK framework to destination folder ... ${NC}" cd "Carthage/Build" mv "iOS" "${XCF_FRM_ZIP_NAME__IOS_DYNAMIC}" - zip -r -X "${XCF_FRM_ZIP_NAME__IOS_DYNAMIC}.framework.zip" "${XCF_FRM_ZIP_NAME__IOS_DYNAMIC}" + zip -r -X "${XCF_FRM_ZIP_NAME__IOS_DYNAMIC}-"${SDK_VERSION}".framework.zip" "${XCF_FRM_ZIP_NAME__IOS_DYNAMIC}" cd - - mv "Carthage/Build/${XCF_FRM_ZIP_NAME__IOS_DYNAMIC}.framework.zip" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" + mv "Carthage/Build/${XCF_FRM_ZIP_NAME__IOS_DYNAMIC}-"${SDK_VERSION}".framework.zip" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" mv "Carthage/Build/${XCF_FRM_ZIP_NAME__IOS_DYNAMIC}" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Done! ${NC}" else @@ -67,9 +67,9 @@ then echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Move Carthage generated dynamic tvOS SDK framework to destination folder ... ${NC}" cd "Carthage/Build" mv "tvOS" "${XCF_FRM_ZIP_NAME__TV_DYNAMIC}" - zip -r -X "${XCF_FRM_ZIP_NAME__TV_DYNAMIC}.framework.zip" "${XCF_FRM_ZIP_NAME__TV_DYNAMIC}" + zip -r -X "${XCF_FRM_ZIP_NAME__TV_DYNAMIC}-"${SDK_VERSION}".framework.zip" "${XCF_FRM_ZIP_NAME__TV_DYNAMIC}" cd - - mv "Carthage/Build/${XCF_FRM_ZIP_NAME__TV_DYNAMIC}.framework.zip" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" + mv "Carthage/Build/${XCF_FRM_ZIP_NAME__TV_DYNAMIC}-"${SDK_VERSION}".framework.zip" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" mv "Carthage/Build/${XCF_FRM_ZIP_NAME__TV_DYNAMIC}" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Done! ${NC}" else @@ -97,9 +97,9 @@ then echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Move Carthage generated dynamic iMessage SDK framework to destination folder ... ${NC}" cd "Carthage/Build" mv "iOS" "${XCF_FRM_ZIP_NAME__IM_DYNAMIC}" - zip -r -X "${XCF_FRM_ZIP_NAME__IM_DYNAMIC}.framework.zip" "${XCF_FRM_ZIP_NAME__IM_DYNAMIC}" + zip -r -X "${XCF_FRM_ZIP_NAME__IM_DYNAMIC}-"${SDK_VERSION}".framework.zip" "${XCF_FRM_ZIP_NAME__IM_DYNAMIC}" cd - - mv "Carthage/Build/${XCF_FRM_ZIP_NAME__IM_DYNAMIC}.framework.zip" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" + mv "Carthage/Build/${XCF_FRM_ZIP_NAME__IM_DYNAMIC}-"${SDK_VERSION}".framework.zip" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" mv "Carthage/Build/${XCF_FRM_ZIP_NAME__IM_DYNAMIC}" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Done! ${NC}" else @@ -127,9 +127,9 @@ then echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Move Carthage generated dynamic WebBridge SDK framework to destination folder ... ${NC}" cd "Carthage/Build" mv "iOS" "${XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC}" - zip -r -X "${XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC}.framework.zip" "${XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC}" + zip -r -X "${XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC}-"${SDK_VERSION}".framework.zip" "${XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC}" cd - - mv "Carthage/Build/${XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC}.framework.zip" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" + mv "Carthage/Build/${XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC}-"${SDK_VERSION}".framework.zip" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" mv "Carthage/Build/${XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC}" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_FRMK_FOLDER}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Done! ${NC}" else diff --git a/scripts/dynamic_xcframeworks.sh b/scripts/dynamic_xcframeworks.sh index 1eafe328f..e109cae2e 100755 --- a/scripts/dynamic_xcframeworks.sh +++ b/scripts/dynamic_xcframeworks.sh @@ -121,9 +121,9 @@ then if [[ $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_TV_DYNAMIC}.xcframework.zip" + 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" else - archive_framework "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_XCFRMK_FOLDER}" "${XCF_FRM_NAME__ADJUST_TV}.xcframework" "${XCF_FRM_ZIP_NAME__TV_DYNAMIC}.xcframework.zip" + 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 @@ -167,7 +167,7 @@ then echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =${NC}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} XCFramework: Archiving (ZIP) Dynamic XCFramework for iOS (iMessage) ...${NC}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =${NC}" - archive_framework "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_XCFRMK_FOLDER}" "${XCF_FRM_NAME__ADJUST_IM}.xcframework" "${XCF_FRM_ZIP_NAME__IM_DYNAMIC}.xcframework.zip" + archive_framework "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_XCFRMK_FOLDER}" "${XCF_FRM_NAME__ADJUST_IM}.xcframework" "${XCF_FRM_ZIP_NAME__IM_DYNAMIC}-"${SDK_VERSION}".xcframework.zip" fi # = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = @@ -213,7 +213,7 @@ then echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =${NC}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} XCFramework: Archiving (ZIP) Dynamic XCFramework for iOS (WebBridge) ...${NC}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =${NC}" - archive_framework "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_XCFRMK_FOLDER}" "${XCF_FRM_NAME__ADJUST_WEB_BRIDGE}.xcframework" "${XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC}.xcframework.zip" + archive_framework "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_DYNAMIC_XCFRMK_FOLDER}" "${XCF_FRM_NAME__ADJUST_WEB_BRIDGE}.xcframework" "${XCF_FRM_ZIP_NAME__WEB_BRIDGE_DYNAMIC}-"${SDK_VERSION}".xcframework.zip" fi # = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = diff --git a/scripts/static_frameworks.sh b/scripts/static_frameworks.sh index e37e40896..1b9cda3a0 100755 --- a/scripts/static_frameworks.sh +++ b/scripts/static_frameworks.sh @@ -11,7 +11,7 @@ then echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =${NC}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} XCFramework: Buiding Static Frameworks for iOS...${NC}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =${NC}" - build_static_fat_framework "${SCHEMA_NAME__ADJUST_IOS_STATIC}" "ios" "${XCF_FRM_NAME__ADJUST_IOS}" "${XCF_OUTPUT_FOLDER}" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_STATIC_FRMK_FOLDER}" "${XCF_FRM_ZIP_NAME__IOS_STATIC}.framework.zip" + build_static_fat_framework "${SCHEMA_NAME__ADJUST_IOS_STATIC}" "ios" "${XCF_FRM_NAME__ADJUST_IOS}" "${XCF_OUTPUT_FOLDER}" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_STATIC_FRMK_FOLDER}" "${XCF_FRM_ZIP_NAME__IOS_STATIC}-"${SDK_VERSION}".framework.zip" else echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Skipping iOS SDK framework build ... ${NC}" fi @@ -21,7 +21,7 @@ then echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =${NC}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} XCFramework: Buiding static Frameworks for tvOS...${NC}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =${NC}" - build_static_fat_framework "${SCHEMA_NAME__ADJUST_TV_STATIC}" "tvos" "${XCF_FRM_NAME__ADJUST_TV}" "${XCF_OUTPUT_FOLDER}" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_STATIC_FRMK_FOLDER}" "${XCF_FRM_ZIP_NAME__TV_STATIC}.framework.zip" + build_static_fat_framework "${SCHEMA_NAME__ADJUST_TV_STATIC}" "tvos" "${XCF_FRM_NAME__ADJUST_TV}" "${XCF_OUTPUT_FOLDER}" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_STATIC_FRMK_FOLDER}" "${XCF_FRM_ZIP_NAME__TV_STATIC}-"${SDK_VERSION}".framework.zip" else echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Skipping tvOS SDK framework build ... ${NC}" fi @@ -31,7 +31,7 @@ then echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =${NC}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} XCFramework: Buiding static Frameworks for iOS (iMessage)...${NC}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =${NC}" - build_static_fat_framework "${SCHEMA_NAME__ADJUST_IM_STATIC}" "ios" "${XCF_FRM_NAME__ADJUST_IM}" "${XCF_OUTPUT_FOLDER}" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_STATIC_FRMK_FOLDER}" "${XCF_FRM_ZIP_NAME__IM_STATIC}.framework.zip" + build_static_fat_framework "${SCHEMA_NAME__ADJUST_IM_STATIC}" "ios" "${XCF_FRM_NAME__ADJUST_IM}" "${XCF_OUTPUT_FOLDER}" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_STATIC_FRMK_FOLDER}" "${XCF_FRM_ZIP_NAME__IM_STATIC}-"${SDK_VERSION}".framework.zip" else echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Skipping iMessage SDK framework build ... ${NC}" fi @@ -41,7 +41,7 @@ then echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =${NC}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} XCFramework: Buiding static Frameworks for iOS (WebBridge)...${NC}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =${NC}" - build_static_fat_framework "${SCHEMA_NAME__ADJUST_WEB_BRIDGE_STATIC}" "ios" "${XCF_FRM_NAME__ADJUST_WEB_BRIDGE}" "${XCF_OUTPUT_FOLDER}" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_STATIC_FRMK_FOLDER}" "${XCF_FRM_ZIP_NAME__WEB_BRIDGE_STATIC}.framework.zip" + build_static_fat_framework "${SCHEMA_NAME__ADJUST_WEB_BRIDGE_STATIC}" "ios" "${XCF_FRM_NAME__ADJUST_WEB_BRIDGE}" "${XCF_OUTPUT_FOLDER}" "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_STATIC_FRMK_FOLDER}" "${XCF_FRM_ZIP_NAME__WEB_BRIDGE_STATIC}-"${SDK_VERSION}".framework.zip" else echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} Skipping iOS (WebBridge) SDK framework build ... ${NC}" fi diff --git a/scripts/static_xcframeworks.sh b/scripts/static_xcframeworks.sh index 2e60e5df2..c0746c4fe 100755 --- a/scripts/static_xcframeworks.sh +++ b/scripts/static_xcframeworks.sh @@ -94,9 +94,9 @@ then if [[ $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_TV_STATIC}.xcframework.zip" + 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" else - archive_framework "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_STATIC_XCFRMK_FOLDER}" "${XCF_FRM_NAME__ADJUST_TV}.xcframework" "${XCF_FRM_ZIP_NAME__TV_STATIC}.xcframework.zip" + 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 @@ -130,7 +130,7 @@ then echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =${NC}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} XCFramework: Archiving (ZIP) Static XCFramework for iOS (iMessage)...${NC}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =${NC}" - archive_framework "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_STATIC_XCFRMK_FOLDER}" "${XCF_FRM_NAME__ADJUST_IM}.xcframework" "${XCF_FRM_ZIP_NAME__IM_STATIC}.xcframework.zip" + archive_framework "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_STATIC_XCFRMK_FOLDER}" "${XCF_FRM_NAME__ADJUST_IM}.xcframework" "${XCF_FRM_ZIP_NAME__IM_STATIC}-"${SDK_VERSION}".xcframework.zip" fi @@ -163,7 +163,7 @@ then echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =${NC}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} XCFramework: Archiving (ZIP) Static XCFramework for iOS (WebBridge)...${NC}" echo -e "${CYAN}[ADJUST][BUILD]:${GREEN} = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =${NC}" - archive_framework "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_STATIC_XCFRMK_FOLDER}" "${XCF_FRM_NAME__ADJUST_WEB_BRIDGE}.xcframework" "${XCF_FRM_ZIP_NAME__WEB_BRIDGE_STATIC}.xcframework.zip" + archive_framework "${XCF_OUTPUT_FOLDER}/${XCF_OUTPUT_STATIC_XCFRMK_FOLDER}" "${XCF_FRM_NAME__ADJUST_WEB_BRIDGE}.xcframework" "${XCF_FRM_ZIP_NAME__WEB_BRIDGE_STATIC}-"${SDK_VERSION}".xcframework.zip" fi # = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = From 7614f17bfc79db9e621d14e31d56f61b9f0d82e6 Mon Sep 17 00:00:00 2001 From: Genady Buchatsky Date: Mon, 26 Sep 2022 16:27:39 +0200 Subject: [PATCH 14/14] build: script code allignment --- scripts/build_definitions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build_definitions.sh b/scripts/build_definitions.sh index 5ccbcc74a..cc3921921 100755 --- a/scripts/build_definitions.sh +++ b/scripts/build_definitions.sh @@ -253,8 +253,8 @@ Usage: $0 [options] XCODE12PLUS=1 fi - SDK_VERSION=$(head -n 1 VERSION) - echo "$SDK_VERSION" + SDK_VERSION=$(head -n 1 VERSION) + echo "$SDK_VERSION" # Build, Lipo an Zip framework function function build_static_fat_framework() {