Merge pull request #473 from adjust/v4232

uerceg · web-flow · commit 950ba354221f · 2020-09-28T14:29:54.000+02:00
Version 4.23.2
diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,6 @@ Frameworks
 
 # Code style
 uncrustify.cfg
+
+#SPM
+.swiftpm/
diff --git 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
@@ -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
@@ -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/Adjust/include/ADJAttribution.h b/Adjust/include/ADJAttribution.h
@@ -0,0 +1 @@
+../ADJAttribution.h
diff --git a/Adjust/include/ADJConfig.h b/Adjust/include/ADJConfig.h
@@ -0,0 +1 @@
+../ADJConfig.h
diff --git a/Adjust/include/ADJEvent.h b/Adjust/include/ADJEvent.h
@@ -0,0 +1 @@
+../ADJEvent.h
diff --git a/Adjust/include/ADJEventFailure.h b/Adjust/include/ADJEventFailure.h
@@ -0,0 +1 @@
+../ADJEventFailure.h
diff --git a/Adjust/include/ADJEventSuccess.h b/Adjust/include/ADJEventSuccess.h
@@ -0,0 +1 @@
+../ADJEventSuccess.h
diff --git a/Adjust/include/ADJLogger.h b/Adjust/include/ADJLogger.h
@@ -0,0 +1 @@
+../ADJLogger.h
diff --git a/Adjust/include/ADJSessionFailure.h b/Adjust/include/ADJSessionFailure.h
@@ -0,0 +1 @@
+../ADJSessionFailure.h
diff --git a/Adjust/include/ADJSessionSuccess.h b/Adjust/include/ADJSessionSuccess.h
@@ -0,0 +1 @@
+../ADJSessionSuccess.h
diff --git a/Adjust/include/ADJSubscription.h b/Adjust/include/ADJSubscription.h
@@ -0,0 +1 @@
+../ADJSubscription.h
diff --git a/Adjust/include/Adjust.h b/Adjust/include/Adjust.h
@@ -0,0 +1 @@
+../Adjust.h
diff --git a/AdjustBridge/Adjust b/AdjustBridge/Adjust
@@ -0,0 +1 @@
+../Adjust
diff --git 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/AdjustBridge/include/AdjustBridge.h b/AdjustBridge/include/AdjustBridge.h
@@ -0,0 +1 @@
+../AdjustBridge.h
diff --git a/AdjustBridge/include/AdjustBridgeRegister.h b/AdjustBridge/include/AdjustBridgeRegister.h
@@ -0,0 +1 @@
+../AdjustBridgeRegister.h
diff --git a/AdjustBridge/include/WKWebViewJavascriptBridge.h b/AdjustBridge/include/WKWebViewJavascriptBridge.h
@@ -0,0 +1 @@
+../WebViewJavascriptBridge/WKWebViewJavascriptBridge.h
diff --git a/AdjustBridge/include/WebViewJavascriptBridgeBase.h b/AdjustBridge/include/WebViewJavascriptBridgeBase.h
@@ -0,0 +1 @@
+../WebViewJavascriptBridge/WebViewJavascriptBridgeBase.h
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.23.1";
+    self.clientSdk = @"ios4.23.2";
     self.suffix = @"";
     self.environment = @"sandbox";
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### Version 4.23.2 (28th September 2020)
+#### Added
+- 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/Package.swift 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/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
@@ -1 +1 @@
-4.23.1
+4.23.2
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/plugin/Criteo/Adjust b/plugin/Criteo/Adjust
@@ -0,0 +1 @@
+../../Adjust
diff --git a/plugin/Sociomantic/Adjust b/plugin/Sociomantic/Adjust
@@ -0,0 +1 @@
+../../Adjust
diff --git a/plugin/Trademob/Adjust b/plugin/Trademob/Adjust
@@ -0,0 +1 @@
+../../Adjust
