From 7ecb3f8ad6d03d7102379ec3e8adc6d553c3c29c Mon Sep 17 00:00:00 2001 From: mstfy Date: Sat, 12 Sep 2020 12:43:15 +0300 Subject: [PATCH 1/4] implement spm support --- .gitignore | 3 + Adjust/include/ADJAttribution.h | 1 + Adjust/include/ADJConfig.h | 1 + Adjust/include/ADJEvent.h | 1 + Adjust/include/ADJEventFailure.h | 1 + Adjust/include/ADJEventSuccess.h | 1 + Adjust/include/ADJLogger.h | 1 + Adjust/include/ADJSessionFailure.h | 1 + Adjust/include/ADJSessionSuccess.h | 1 + Adjust/include/ADJSubscription.h | 1 + Adjust/include/Adjust.h | 1 + AdjustBridge/Adjust | 1 + AdjustBridge/include/AdjustBridge.h | 1 + AdjustBridge/include/AdjustBridgeRegister.h | 1 + .../include/WKWebViewJavascriptBridge.h | 1 + .../include/WebViewJavascriptBridgeBase.h | 1 + Package.swift | 65 +++++++++++++++++++ plugin/Criteo/Adjust | 1 + plugin/Sociomantic/Adjust | 1 + plugin/Trademob/Adjust | 1 + 20 files changed, 86 insertions(+) create mode 120000 Adjust/include/ADJAttribution.h create mode 120000 Adjust/include/ADJConfig.h create mode 120000 Adjust/include/ADJEvent.h create mode 120000 Adjust/include/ADJEventFailure.h create mode 120000 Adjust/include/ADJEventSuccess.h create mode 120000 Adjust/include/ADJLogger.h create mode 120000 Adjust/include/ADJSessionFailure.h create mode 120000 Adjust/include/ADJSessionSuccess.h create mode 120000 Adjust/include/ADJSubscription.h create mode 120000 Adjust/include/Adjust.h create mode 120000 AdjustBridge/Adjust create mode 120000 AdjustBridge/include/AdjustBridge.h create mode 120000 AdjustBridge/include/AdjustBridgeRegister.h create mode 120000 AdjustBridge/include/WKWebViewJavascriptBridge.h create mode 120000 AdjustBridge/include/WebViewJavascriptBridgeBase.h create mode 100644 Package.swift create mode 120000 plugin/Criteo/Adjust create mode 120000 plugin/Sociomantic/Adjust create mode 120000 plugin/Trademob/Adjust diff --git a/.gitignore b/.gitignore index a64b42758..bbed34499 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,6 @@ Frameworks # Code style uncrustify.cfg + +#SPM +.swiftpm/ \ No newline at end of file diff --git a/Adjust/include/ADJAttribution.h b/Adjust/include/ADJAttribution.h new file mode 120000 index 000000000..5ee8609a9 --- /dev/null +++ b/Adjust/include/ADJAttribution.h @@ -0,0 +1 @@ +../ADJAttribution.h \ No newline at end of file diff --git a/Adjust/include/ADJConfig.h b/Adjust/include/ADJConfig.h new file mode 120000 index 000000000..103b8d48b --- /dev/null +++ b/Adjust/include/ADJConfig.h @@ -0,0 +1 @@ +../ADJConfig.h \ No newline at end of file diff --git a/Adjust/include/ADJEvent.h b/Adjust/include/ADJEvent.h new file mode 120000 index 000000000..9d24258c8 --- /dev/null +++ b/Adjust/include/ADJEvent.h @@ -0,0 +1 @@ +../ADJEvent.h \ No newline at end of file diff --git a/Adjust/include/ADJEventFailure.h b/Adjust/include/ADJEventFailure.h new file mode 120000 index 000000000..605c66d6e --- /dev/null +++ b/Adjust/include/ADJEventFailure.h @@ -0,0 +1 @@ +../ADJEventFailure.h \ No newline at end of file diff --git a/Adjust/include/ADJEventSuccess.h b/Adjust/include/ADJEventSuccess.h new file mode 120000 index 000000000..84713bee4 --- /dev/null +++ b/Adjust/include/ADJEventSuccess.h @@ -0,0 +1 @@ +../ADJEventSuccess.h \ No newline at end of file diff --git a/Adjust/include/ADJLogger.h b/Adjust/include/ADJLogger.h new file mode 120000 index 000000000..4a405dc62 --- /dev/null +++ b/Adjust/include/ADJLogger.h @@ -0,0 +1 @@ +../ADJLogger.h \ No newline at end of file diff --git a/Adjust/include/ADJSessionFailure.h b/Adjust/include/ADJSessionFailure.h new file mode 120000 index 000000000..ce738f2f6 --- /dev/null +++ b/Adjust/include/ADJSessionFailure.h @@ -0,0 +1 @@ +../ADJSessionFailure.h \ No newline at end of file diff --git a/Adjust/include/ADJSessionSuccess.h b/Adjust/include/ADJSessionSuccess.h new file mode 120000 index 000000000..4b1659c23 --- /dev/null +++ b/Adjust/include/ADJSessionSuccess.h @@ -0,0 +1 @@ +../ADJSessionSuccess.h \ No newline at end of file diff --git a/Adjust/include/ADJSubscription.h b/Adjust/include/ADJSubscription.h new file mode 120000 index 000000000..0914f4934 --- /dev/null +++ b/Adjust/include/ADJSubscription.h @@ -0,0 +1 @@ +../ADJSubscription.h \ No newline at end of file diff --git a/Adjust/include/Adjust.h b/Adjust/include/Adjust.h new file mode 120000 index 000000000..e1e72790b --- /dev/null +++ b/Adjust/include/Adjust.h @@ -0,0 +1 @@ +../Adjust.h \ No newline at end of file diff --git a/AdjustBridge/Adjust b/AdjustBridge/Adjust new file mode 120000 index 000000000..7685f2baf --- /dev/null +++ b/AdjustBridge/Adjust @@ -0,0 +1 @@ +../Adjust \ No newline at end of file diff --git a/AdjustBridge/include/AdjustBridge.h b/AdjustBridge/include/AdjustBridge.h new file mode 120000 index 000000000..5ba1dab71 --- /dev/null +++ b/AdjustBridge/include/AdjustBridge.h @@ -0,0 +1 @@ +../AdjustBridge.h \ No newline at end of file diff --git a/AdjustBridge/include/AdjustBridgeRegister.h b/AdjustBridge/include/AdjustBridgeRegister.h new file mode 120000 index 000000000..04162c01e --- /dev/null +++ b/AdjustBridge/include/AdjustBridgeRegister.h @@ -0,0 +1 @@ +../AdjustBridgeRegister.h \ No newline at end of file diff --git a/AdjustBridge/include/WKWebViewJavascriptBridge.h b/AdjustBridge/include/WKWebViewJavascriptBridge.h new file mode 120000 index 000000000..4710b564a --- /dev/null +++ b/AdjustBridge/include/WKWebViewJavascriptBridge.h @@ -0,0 +1 @@ +../WebViewJavascriptBridge/WKWebViewJavascriptBridge.h \ No newline at end of file diff --git a/AdjustBridge/include/WebViewJavascriptBridgeBase.h b/AdjustBridge/include/WebViewJavascriptBridgeBase.h new file mode 120000 index 000000000..858b7ae28 --- /dev/null +++ b/AdjustBridge/include/WebViewJavascriptBridgeBase.h @@ -0,0 +1 @@ +../WebViewJavascriptBridge/WebViewJavascriptBridgeBase.h \ No newline at end of file diff --git a/Package.swift b/Package.swift new file mode 100644 index 000000000..d3f135a4d --- /dev/null +++ b/Package.swift @@ -0,0 +1,65 @@ +// swift-tools-version:5.3 + +import PackageDescription + +let package = Package( + name: "Adjust", + products: [ + .library(name: "Adjust", targets: ["Adjust"]), + .library(name: "Sociomantic", targets: ["Sociomantic", "Adjust"]), + .library(name: "Criteo", targets: ["Criteo", "Adjust"]), + .library(name: "Trademob", targets: ["Trademob", "Adjust"]), + .library(name: "WebBridge", targets: ["WebBridge", "Adjust"]) + ], + targets: [ + .target( + name: "Adjust", + path: "Adjust", + exclude: ["info.plist"], + cSettings: [ + .headerSearchPath(""), + .headerSearchPath("ADJAdditions") + ] + ), + .target( + name: "Sociomantic", + path: "plugin/Sociomantic", + exclude: ["Adjust"], + publicHeadersPath: "", + cSettings: [ + .headerSearchPath("Adjust"), + .headerSearchPath("Adjust/ADJAdditions") + ] + ), + .target( + name: "Criteo", + path: "plugin/Criteo", + exclude: ["Adjust"], + publicHeadersPath: "", + cSettings: [ + .headerSearchPath("Adjust"), + .headerSearchPath("Adjust/ADJAdditions") + ] + ), + .target( + name: "Trademob", + path: "plugin/Trademob", + exclude: ["Adjust"], + publicHeadersPath: "", + cSettings: [ + .headerSearchPath("Adjust"), + .headerSearchPath("Adjust/ADJAdditions") + ] + ), + .target( + name: "WebBridge", + path: "AdjustBridge", + exclude: ["Adjust"], + cSettings: [ + .headerSearchPath(""), + .headerSearchPath("WebViewJavascriptBridge"), + .headerSearchPath("Adjust"), + ] + ), + ] +) diff --git a/plugin/Criteo/Adjust b/plugin/Criteo/Adjust new file mode 120000 index 000000000..9a4029b12 --- /dev/null +++ b/plugin/Criteo/Adjust @@ -0,0 +1 @@ +../../Adjust \ No newline at end of file diff --git a/plugin/Sociomantic/Adjust b/plugin/Sociomantic/Adjust new file mode 120000 index 000000000..9a4029b12 --- /dev/null +++ b/plugin/Sociomantic/Adjust @@ -0,0 +1 @@ +../../Adjust \ No newline at end of file diff --git a/plugin/Trademob/Adjust b/plugin/Trademob/Adjust new file mode 120000 index 000000000..9a4029b12 --- /dev/null +++ b/plugin/Trademob/Adjust @@ -0,0 +1 @@ +../../Adjust \ No newline at end of file From bdac39e7267c2f35a7c48f9f244103d539f0d241 Mon Sep 17 00:00:00 2001 From: mstfy Date: Sat, 12 Sep 2020 16:12:32 +0300 Subject: [PATCH 2/4] fix resource warning --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index d3f135a4d..300aead22 100644 --- a/Package.swift +++ b/Package.swift @@ -15,7 +15,7 @@ let package = Package( .target( name: "Adjust", path: "Adjust", - exclude: ["info.plist"], + exclude: ["Info.plist"], cSettings: [ .headerSearchPath(""), .headerSearchPath("ADJAdditions") From 9397fb4dc2d8d012c4af7de0b2b716460ffbfa7d Mon Sep 17 00:00:00 2001 From: rabc Date: Fri, 25 Sep 2020 16:28:40 +0200 Subject: [PATCH 3/4] Change version and changelog --- Adjust.podspec | 4 ++-- Adjust/ADJUtil.m | 2 +- Adjust/Adjust.h | 2 +- AdjustBridge/AdjustBridgeRegister.m | 2 +- AdjustTests/AdjustUnitTests/ADJPackageFields.m | 2 +- CHANGELOG.md | 6 ++++++ README.md | 12 ++++++++++-- VERSION | 2 +- doc/chinese/README.md | 4 ++-- doc/english/migrate.md | 2 +- doc/english/web_views.md | 2 +- doc/japanese/README.md | 4 ++-- doc/korean/README.md | 4 ++-- doc/korean/web_views.md | 2 +- doc/migrate.md | 2 +- 15 files changed, 33 insertions(+), 19 deletions(-) diff --git a/Adjust.podspec b/Adjust.podspec index 0e09e3387..1c870f59a 100644 --- a/Adjust.podspec +++ b/Adjust.podspec @@ -1,11 +1,11 @@ Pod::Spec.new do |s| s.name = "Adjust" - s.version = "4.23.1" + s.version = "4.23.2" 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.23.1" } + s.source = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.23.2" } 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 31c22d664..2941d759a 100644 --- a/Adjust/ADJUtil.m +++ b/Adjust/ADJUtil.m @@ -37,7 +37,7 @@ static CTTelephonyNetworkInfo *networkInfo = nil; #endif -static NSString * const kClientSdk = @"ios4.23.1"; +static NSString * const kClientSdk = @"ios4.23.2"; 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 831c7fe36..2d7605e3a 100644 --- a/Adjust/Adjust.h +++ b/Adjust/Adjust.h @@ -2,7 +2,7 @@ // Adjust.h // Adjust // -// V4.23.1 +// V4.23.2 // 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 852a4461a..db7ed137e 100644 --- a/AdjustBridge/AdjustBridgeRegister.m +++ b/AdjustBridge/AdjustBridgeRegister.m @@ -221,7 +221,7 @@ + (NSString *)adjust_js { if (this.sdkPrefix) { return this.sdkPrefix; } else { - return 'web-bridge4.23.1'; + return 'web-bridge4.23.2'; } }, setTestOptions: function(testOptions) { diff --git a/AdjustTests/AdjustUnitTests/ADJPackageFields.m b/AdjustTests/AdjustUnitTests/ADJPackageFields.m index 69f9db355..598df46e6 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.23.1"; + self.clientSdk = @"ios4.23.2"; self.suffix = @""; self.environment = @"sandbox"; diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f10157cd..5b18478d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +### Version 4.23.2 (28th September 2020) +#### Added +- Support for Swift Package Manager (thanks to @mstfy) + +--- + ### Version 4.23.1 (16th September 2020) #### Fixed - Fixed warning about storing negative value to `NSUInteger` data type. diff --git a/README.md b/README.md index 05dc731b4..f16a1e818 100644 --- a/README.md +++ b/README.md @@ -78,13 +78,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.23.1' +pod 'Adjust', '~> 4.23.2' ``` or: ```ruby -pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.23.1' +pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.23.2' ``` --- @@ -97,6 +97,14 @@ github "adjust/ios_sdk" --- +If you're using Swift Package Manager, you can add the repository address directly in Xcode going to File > Swift Packages > Add Package Dependency and continue from [this step](#sdk-frameworks): + +``` +https://github.com/adjust/ios_sdk +``` + +--- + You can also choose to integrate the Adjust SDK by adding it to your project as a framework. On the [releases page][releases] you can find the following archives: * `AdjustSdkStatic.framework.zip` diff --git a/VERSION b/VERSION index 0ef2c601a..dc728bb42 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.23.1 +4.23.2 diff --git a/doc/chinese/README.md b/doc/chinese/README.md index 222b6b5fe..e4da5fc85 100644 --- a/doc/chinese/README.md +++ b/doc/chinese/README.md @@ -76,13 +76,13 @@ Read this in other languages: [English][en-readme], [中文][zh-readme], [日本 如果您正在使用[CocoaPods][cocoapods],您可以将以下代码行添加至 `Podfile`，然后继续进行[此步骤](#sdk-integrate): ```ruby -pod 'Adjust', '~> 4.23.1' +pod 'Adjust', '~> 4.23.2' ``` 或: ```ruby -pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.23.1' +pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.23.2' ``` --- diff --git a/doc/english/migrate.md b/doc/english/migrate.md index aa9f56278..de0e69204 100644 --- a/doc/english/migrate.md +++ b/doc/english/migrate.md @@ -1,4 +1,4 @@ -## Migrate your Adjust SDK for iOS to v4.23.1 from v3.4.0 +## Migrate your Adjust SDK for iOS to v4.23.2 from v3.4.0 ### Initial setup diff --git a/doc/english/web_views.md b/doc/english/web_views.md index 0aa8bd5ec..aa8dd599d 100644 --- a/doc/english/web_views.md +++ b/doc/english/web_views.md @@ -64,7 +64,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.23.1' +pod 'Adjust/WebBridge', '~> 4.23.2' ``` --- diff --git a/doc/japanese/README.md b/doc/japanese/README.md index 594a7a740..0a13eb404 100644 --- a/doc/japanese/README.md +++ b/doc/japanese/README.md @@ -25,13 +25,13 @@ adjust SDKをiOSプロジェクトに連携する手順を説明します。 [こちらの手順](#sdk-integrate)に進んでください。 ```ruby -pod 'Adjust', '~> 4.23.1' +pod 'Adjust', '~> 4.23.2' ``` または ```ruby -pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.23.1' +pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.23.2' ``` --- diff --git a/doc/korean/README.md b/doc/korean/README.md index 6211aa03a..e24d86bdc 100644 --- a/doc/korean/README.md +++ b/doc/korean/README.md @@ -76,13 +76,13 @@ iOS 개발용 Xcode를 사용한다는 가정하에 iOS 프로젝트에 Adjust S [CocoaPods][cocoapods]를 사용하는 경우, 다음 내용을 `Podfile`에 추가한 후 [해당 단계](#sdk-integrate)를 완료하세요. ```ruby -pod 'Adjust', '~> 4.23.1' +pod 'Adjust', '~> 4.23.2' ``` 또는: ```ruby -pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.23.1' +pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.23.2' ``` --- diff --git a/doc/korean/web_views.md b/doc/korean/web_views.md index 16845895b..4d1c4ae9e 100644 --- a/doc/korean/web_views.md +++ b/doc/korean/web_views.md @@ -64,7 +64,7 @@ iOS 개발용 Xcode를 사용한다는 가정하에 iOS 프로젝트에 Adjust S [CocoaPods][cocoapods]를 사용하는 경우, 다음 내용을 'Podfile'에 추가한 후 [해당 단계](#sdk-integrate)를 완료하세요. ```ruby -pod 'Adjust/WebBridge', '~> 4.23.1' +pod 'Adjust/WebBridge', '~> 4.23.2' ``` --- diff --git a/doc/migrate.md b/doc/migrate.md index aa9f56278..de0e69204 100644 --- a/doc/migrate.md +++ b/doc/migrate.md @@ -1,4 +1,4 @@ -## Migrate your Adjust SDK for iOS to v4.23.1 from v3.4.0 +## Migrate your Adjust SDK for iOS to v4.23.2 from v3.4.0 ### Initial setup From be72aa8f586c825fd02e7ed2fc933c3f12b56772 Mon Sep 17 00:00:00 2001 From: ugi Date: Mon, 28 Sep 2020 12:45:03 +0200 Subject: [PATCH 4/4] cleanup --- CHANGELOG.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b18478d4..6cfd62a5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ### Version 4.23.2 (28th September 2020) #### Added -- Support for Swift Package Manager (thanks to @mstfy) +- Added support for Swift Package Manager (thanks to @mstfy). --- diff --git a/README.md b/README.md index f16a1e818..39527bb1b 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ github "adjust/ios_sdk" --- -If you're using Swift Package Manager, you can add the repository address directly in Xcode going to File > Swift Packages > Add Package Dependency and continue from [this step](#sdk-frameworks): +If you're using Swift Package Manager, you can add the repository address directly in Xcode going to `File > Swift Packages > Add Package Dependency` and continue from [this step](#sdk-frameworks): ``` https://github.com/adjust/ios_sdk