Merge pull request #374 from adjust/v4173

Version 4.17.3
adjust · May 24, 2019 · 9fb8de1 · 9fb8de1
2 parents 019a8bb + cd0e01a
commit 9fb8de1
Show file tree

Hide file tree

Showing 93 changed files with 9,309 additions and 249 deletions.
diff --git a/Adjust.podspec b/Adjust.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name           = "Adjust"
-  s.version        = "4.17.2"
+  s.version        = "4.17.3"
   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" => "[email protected]" }
-  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.17.2" }
+  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.17.3" }
   s.ios.deployment_target = '6.0'
   s.tvos.deployment_target = '9.0'
   s.framework      = 'SystemConfiguration'

diff --git a/Adjust.xcodeproj/project.pbxproj b/Adjust.xcodeproj/project.pbxproj
@@ -425,6 +425,34 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		52BD7389221C3EDC004F2E87 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 52BD7374221C3EDB004F2E87 /* PocketSocket.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EEE5E30A18B37DD500BAE47A;
+			remoteInfo = PocketSocket;
+		};
+		52BD738B221C3EDC004F2E87 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 52BD7374221C3EDB004F2E87 /* PocketSocket.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 275D3AE91B02811E0013B9A9;
+			remoteInfo = "PocketSocket-Mac";
+		};
+		52BD738D221C3EDC004F2E87 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 52BD7374221C3EDB004F2E87 /* PocketSocket.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EEE5E36018B37F8700BAE47A;
+			remoteInfo = PSAutobahnClientTests;
+		};
+		52BD738F221C3EDC004F2E87 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 52BD7374221C3EDB004F2E87 /* PocketSocket.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EE453D0F1CABF60300A2EA13;
+			remoteInfo = PSAutobahnServerTests;
+		};
 		6F08421C2007766800568A31 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 6F0842182007766700568A31 /* AdjustTestLibrary.xcodeproj */;
@@ -562,6 +590,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		52BD7374221C3EDB004F2E87 /* PocketSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PocketSocket.xcodeproj; path = PocketSocket/PocketSocket.xcodeproj; sourceTree = "<group>"; };
 		6F0842182007766700568A31 /* AdjustTestLibrary.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = AdjustTestLibrary.xcodeproj; path = AdjustTestLibrary/AdjustTestLibrary.xcodeproj; sourceTree = "<group>"; };
 		6F084240200776A000568A31 /* AdjustTestApp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = AdjustTestApp.xcodeproj; path = AdjustTestApp/AdjustTestApp.xcodeproj; sourceTree = "<group>"; };
 		6F7AF63F211878BC00F730B2 /* AdjustWebBridgeTestApp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = AdjustWebBridgeTestApp.xcodeproj; path = AdjustWebBridgeTestApp/AdjustWebBridgeTestApp.xcodeproj; sourceTree = "<group>"; };
@@ -1076,6 +1105,17 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		52BD7375221C3EDB004F2E87 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				52BD738A221C3EDC004F2E87 /* libPocketSocket.a */,
+				52BD738C221C3EDC004F2E87 /* libPocketSocket-Mac.a */,
+				52BD738E221C3EDC004F2E87 /* PSAutobahnClientTests.xctest */,
+				52BD7390221C3EDC004F2E87 /* PSAutobahnServerTests.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		6F0841FB2007749C00568A31 /* AdjustUnitTests */ = {
 			isa = PBXGroup;
 			children = (
@@ -1310,6 +1350,7 @@
 		96E5E39A18BBB49E008E7B30 /* AdjustTests */ = {
 			isa = PBXGroup;
 			children = (
+				52BD7374221C3EDB004F2E87 /* PocketSocket.xcodeproj */,
 				6F0842182007766700568A31 /* AdjustTestLibrary.xcodeproj */,
 				6F084240200776A000568A31 /* AdjustTestApp.xcodeproj */,
 				6F7AF63F211878BC00F730B2 /* AdjustWebBridgeTestApp.xcodeproj */,
@@ -2253,6 +2294,10 @@
 					ProductGroup = 6F7AF640211878BC00F730B2 /* Products */;
 					ProjectRef = 6F7AF63F211878BC00F730B2 /* AdjustWebBridgeTestApp.xcodeproj */;
 				},
+				{
+					ProductGroup = 52BD7375221C3EDB004F2E87 /* Products */;
+					ProjectRef = 52BD7374221C3EDB004F2E87 /* PocketSocket.xcodeproj */;
+				},
 			);
 			projectRoot = "";
 			targets = (
@@ -2270,6 +2315,34 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
+		52BD738A221C3EDC004F2E87 /* libPocketSocket.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libPocketSocket.a;
+			remoteRef = 52BD7389221C3EDC004F2E87 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		52BD738C221C3EDC004F2E87 /* libPocketSocket-Mac.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libPocketSocket-Mac.a";
+			remoteRef = 52BD738B221C3EDC004F2E87 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		52BD738E221C3EDC004F2E87 /* PSAutobahnClientTests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = PSAutobahnClientTests.xctest;
+			remoteRef = 52BD738D221C3EDC004F2E87 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		52BD7390221C3EDC004F2E87 /* PSAutobahnServerTests.app */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.application;
+			path = PSAutobahnServerTests.app;
+			remoteRef = 52BD738F221C3EDC004F2E87 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		6F08421D2007766800568A31 /* libAdjustTestLibrary.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -2959,6 +3032,7 @@
 		9679923518BBAE2800394606 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				DEVELOPMENT_TEAM = QGUGW9AUMK;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(DEVELOPER_FRAMEWORKS_DIR)",

diff --git a/Adjust/ADJActivityHandler.m b/Adjust/ADJActivityHandler.m
@@ -1158,6 +1158,7 @@ - (void)setEnabledI:(ADJActivityHandler *)selfI enabled:(BOOL)enabled {
         if ([ADJUserDefaults getGdprForgetMe]) {
             [selfI setGdprForgetMe];
         }
+        [[UIDevice currentDevice] adjSetIad:selfI triesV3Left:kTryIadV3];
     }
 
     [selfI checkStatusI:selfI

diff --git a/Adjust/ADJUtil.m b/Adjust/ADJUtil.m
@@ -40,7 +40,7 @@
 static CTTelephonyNetworkInfo *networkInfo = nil;
 #endif
 
-static NSString * const kClientSdk                  = @"ios4.17.2";
+static NSString * const kClientSdk                  = @"ios4.17.3";
 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.17.2
+//  V4.17.3
 //  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
@@ -211,7 +211,7 @@ + (NSString *)adjust_js {
                 if (this.sdkPrefix) {
                     return this.sdkPrefix;
                 } else {
-                    return 'web-bridge4.17.2';
+                    return 'web-bridge4.17.3';
                 }
             },
             setTestOptions: function(testOptions) {