From c9a74890c1f3d9149751559a552e2a2b5245ee47 Mon Sep 17 00:00:00 2001 From: uerceg Date: Mon, 10 Dec 2018 11:43:48 +0100 Subject: [PATCH 1/6] Fix logging of excluded deep links --- Adjust/ADJUtil.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Adjust/ADJUtil.m b/Adjust/ADJUtil.m index 2b92a8360..d1ee5fda7 100644 --- a/Adjust/ADJUtil.m +++ b/Adjust/ADJUtil.m @@ -1296,7 +1296,7 @@ + (BOOL)isDeeplinkValid:(NSURL *)url { options:0 range:NSMakeRange(0, [urlString length])]; if ([matches count] > 0) { - [ADJAdjustFactory.logger debug:[NSString stringWithFormat:@"Deep link (%@) processing skipped", urlString]]; + [ADJAdjustFactory.logger debug:@"Deep link (%@) processing skipped", urlString]; return NO; } From 2272d88a98c26f83aeb3a4d6e2085d083a3b9297 Mon Sep 17 00:00:00 2001 From: uerceg Date: Mon, 10 Dec 2018 12:00:23 +0100 Subject: [PATCH 2/6] New version 4.17.1 --- Adjust.podspec | 4 ++-- Adjust/ADJUtil.m | 2 +- Adjust/Adjust.h | 2 +- AdjustBridge/AdjustBridgeRegister.m | 2 +- AdjustTests/AdjustUnitTests/ADJPackageFields.m | 2 +- README.md | 4 ++-- VERSION | 2 +- doc/english/migrate.md | 2 +- doc/english/web_view_migration.md | 2 +- doc/english/web_views.md | 2 +- doc/japanese/migrate_ja.md | 2 +- doc/migrate.md | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Adjust.podspec b/Adjust.podspec index d5aa5afae..b12ea385b 100644 --- a/Adjust.podspec +++ b/Adjust.podspec @@ -1,11 +1,11 @@ Pod::Spec.new do |s| s.name = "Adjust" - s.version = "4.17.0" + s.version = "4.17.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 = { "Christian Wellenbrock" => "welle@adjust.com" } - s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.17.0" } + s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.17.1" } s.ios.deployment_target = '6.0' s.tvos.deployment_target = '9.0' s.framework = 'SystemConfiguration' diff --git a/Adjust/ADJUtil.m b/Adjust/ADJUtil.m index d1ee5fda7..89b7c3c12 100644 --- a/Adjust/ADJUtil.m +++ b/Adjust/ADJUtil.m @@ -40,7 +40,7 @@ static CTTelephonyNetworkInfo *networkInfo = nil; #endif -static NSString * const kClientSdk = @"ios4.17.0"; +static NSString * const kClientSdk = @"ios4.17.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 b1a238ced..0454255a8 100644 --- a/Adjust/Adjust.h +++ b/Adjust/Adjust.h @@ -2,7 +2,7 @@ // Adjust.h // Adjust // -// V4.17.0 +// V4.17.1 // Created by Christian Wellenbrock (wellle) on 23rd July 2013. // Copyright © 2012-2017 Adjust GmbH. All rights reserved. // diff --git a/AdjustBridge/AdjustBridgeRegister.m b/AdjustBridge/AdjustBridgeRegister.m index fbad524bf..71faae06f 100644 --- a/AdjustBridge/AdjustBridgeRegister.m +++ b/AdjustBridge/AdjustBridgeRegister.m @@ -211,7 +211,7 @@ + (NSString *)adjust_js { if (this.sdkPrefix) { return this.sdkPrefix; } else { - return 'web-bridge4.17.0'; + return 'web-bridge4.17.1'; } }, setTestOptions: function(testOptions) { diff --git a/AdjustTests/AdjustUnitTests/ADJPackageFields.m b/AdjustTests/AdjustUnitTests/ADJPackageFields.m index 8d5f010c3..7b51ac3fe 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.17.0"; + self.clientSdk = @"ios4.17.1"; self.suffix = @""; self.environment = @"sandbox"; diff --git a/README.md b/README.md index fff50165d..40c8373ef 100644 --- a/README.md +++ b/README.md @@ -70,13 +70,13 @@ We will describe the steps to integrate the Adjust SDK into your iOS project. We If you're using [CocoaPods][cocoapods], you can add the following line to your `Podfile` and continue from [this step](#sdk-integrate): ```ruby -pod 'Adjust', '~> 4.17.0' +pod 'Adjust', '~> 4.17.1' ``` or: ```ruby -pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.17.0' +pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.17.1' ``` --- diff --git a/VERSION b/VERSION index 43b582715..1b0a87fdf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.17.0 +4.17.1 diff --git a/doc/english/migrate.md b/doc/english/migrate.md index 2ad2302fd..82fb9a52b 100644 --- a/doc/english/migrate.md +++ b/doc/english/migrate.md @@ -1,4 +1,4 @@ -## Migrate your adjust SDK for iOS to v4.17.0 from v3.4.0 +## Migrate your adjust SDK for iOS to v4.17.1 from v3.4.0 ### Initial setup diff --git a/doc/english/web_view_migration.md b/doc/english/web_view_migration.md index 62f9c73bc..92b5a190f 100644 --- a/doc/english/web_view_migration.md +++ b/doc/english/web_view_migration.md @@ -1,4 +1,4 @@ -## Migrate your Adjust web bridge SDK to v4.17.0 or later from v4.9.1 or earlier +## Migrate your Adjust web bridge SDK to v4.17.1 from v4.9.1 or earlier ### Integration diff --git a/doc/english/web_views.md b/doc/english/web_views.md index 44b92bd00..9c865e5cb 100644 --- a/doc/english/web_views.md +++ b/doc/english/web_views.md @@ -63,7 +63,7 @@ We will describe the steps to integrate the Adjust SDK into your iOS project. We If you're using [CocoaPods][cocoapods], you can add the following line to your `Podfile` and continue from [this step](#sdk-integrate): ```ruby -pod 'Adjust/WebBridge', '~> 4.17.0' +pod 'Adjust/WebBridge', '~> 4.17.1' ``` --- diff --git a/doc/japanese/migrate_ja.md b/doc/japanese/migrate_ja.md index 07a5594fc..0199d0d53 100644 --- a/doc/japanese/migrate_ja.md +++ b/doc/japanese/migrate_ja.md @@ -1,4 +1,4 @@ -## iOS用adjust SDKのv3.4.0からv4.17.0への移行 +## iOS用adjust SDKのv3.4.0からv4.17.1への移行 ### 初期設定 diff --git a/doc/migrate.md b/doc/migrate.md index 2ad2302fd..82fb9a52b 100644 --- a/doc/migrate.md +++ b/doc/migrate.md @@ -1,4 +1,4 @@ -## Migrate your adjust SDK for iOS to v4.17.0 from v3.4.0 +## Migrate your adjust SDK for iOS to v4.17.1 from v3.4.0 ### Initial setup From 07b61a8e20e296bbdd86a859f29da6cd2a1bd1a5 Mon Sep 17 00:00:00 2001 From: uerceg Date: Mon, 10 Dec 2018 14:15:31 +0100 Subject: [PATCH 3/6] Revert web bridge version change --- AdjustBridge/AdjustBridgeRegister.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AdjustBridge/AdjustBridgeRegister.m b/AdjustBridge/AdjustBridgeRegister.m index 71faae06f..fbad524bf 100644 --- a/AdjustBridge/AdjustBridgeRegister.m +++ b/AdjustBridge/AdjustBridgeRegister.m @@ -211,7 +211,7 @@ + (NSString *)adjust_js { if (this.sdkPrefix) { return this.sdkPrefix; } else { - return 'web-bridge4.17.1'; + return 'web-bridge4.17.0'; } }, setTestOptions: function(testOptions) { From fadb90cd5a5bedf1e232c5c7a8640cc69c2590a0 Mon Sep 17 00:00:00 2001 From: uerceg Date: Mon, 10 Dec 2018 15:43:58 +0100 Subject: [PATCH 4/6] Adding web bridge test app scheme --- .../xcschemes/AdjustWebBridgeTestApp.xcscheme | 91 +++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 AdjustTests/AdjustWebBridgeTestApp/AdjustWebBridgeTestApp.xcodeproj/xcshareddata/xcschemes/AdjustWebBridgeTestApp.xcscheme diff --git a/AdjustTests/AdjustWebBridgeTestApp/AdjustWebBridgeTestApp.xcodeproj/xcshareddata/xcschemes/AdjustWebBridgeTestApp.xcscheme b/AdjustTests/AdjustWebBridgeTestApp/AdjustWebBridgeTestApp.xcodeproj/xcshareddata/xcschemes/AdjustWebBridgeTestApp.xcscheme new file mode 100644 index 000000000..3e6ceea2d --- /dev/null +++ b/AdjustTests/AdjustWebBridgeTestApp/AdjustWebBridgeTestApp.xcodeproj/xcshareddata/xcschemes/AdjustWebBridgeTestApp.xcscheme @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 448ce13c3fa23dba504e54d0ae368cb7382c6eea Mon Sep 17 00:00:00 2001 From: uerceg Date: Mon, 10 Dec 2018 15:57:06 +0100 Subject: [PATCH 5/6] Adding iMessage example app scheme --- ...xample-iMessage MessagesExtension.xcscheme | 108 ++++++++++++++++++ .../xcschemes/AdjustExample-iMessage.xcscheme | 91 +++++++++++++++ 2 files changed, 199 insertions(+) create mode 100644 examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/xcshareddata/xcschemes/AdjustExample-iMessage MessagesExtension.xcscheme create mode 100644 examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/xcshareddata/xcschemes/AdjustExample-iMessage.xcscheme diff --git a/examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/xcshareddata/xcschemes/AdjustExample-iMessage MessagesExtension.xcscheme b/examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/xcshareddata/xcschemes/AdjustExample-iMessage MessagesExtension.xcscheme new file mode 100644 index 000000000..ebe25dc5b --- /dev/null +++ b/examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/xcshareddata/xcschemes/AdjustExample-iMessage MessagesExtension.xcscheme @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/xcshareddata/xcschemes/AdjustExample-iMessage.xcscheme b/examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/xcshareddata/xcschemes/AdjustExample-iMessage.xcscheme new file mode 100644 index 000000000..910e4f6ed --- /dev/null +++ b/examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/xcshareddata/xcschemes/AdjustExample-iMessage.xcscheme @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 084665ed587c630319dd77cf1c9a7fdb9fed08ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uglje=C5=A1a=20Erceg?= Date: Mon, 10 Dec 2018 16:05:35 +0100 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b539ec6df..4956cd3c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +### Version 4.17.1 (10th December 2018) +#### Fixed +- Fixed issue with printing of certain skipped deep links to debug console output in sandbox mode (https://github.com/adjust/ios_sdk/issues/362). + +--- + ### Version 4.17.0 (4th December 2018) #### Added - Added `sdkVersion` getter to `Adjust` interface to obtain current SDK version string.