Merge pull request #3 from adjust/v103

Version 1.0.3
adjust · Feb 25, 2022 · 4041505 · 4041505
2 parents 9172017 + 392434a
commit 4041505
Show file tree

Hide file tree

Showing 17 changed files with 64 additions and 52 deletions.
diff --git a/AdjustAdobeExtension.podspec b/AdjustAdobeExtension.podspec
@@ -1,16 +1,15 @@
 
 Pod::Spec.new do |s|
   s.name             = 'AdjustAdobeExtension'
-  s.version          = '1.0.2'
+  s.version          = '1.0.3'
   s.summary          = 'Adjust SDK extension for Adobe Experience Platform.'
   s.description      = <<-DESC
 A leading attribution solution that brings the full power of mobile ad measurement to your campaigns.
                        DESC
-
   s.homepage         = 'https://github.com/adjust/ios_adobe_extension'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
   s.author           = { 'Adjust SDK Team' => 'sdk@adjust.com' }
-  s.source           = { :git => 'https://github.com/adjust/ios_adobe_extension.git', :tag => "v1.0.2" }
+  s.source           = { :git => 'https://github.com/adjust/ios_adobe_extension.git', :tag => "v1.0.3" }
 
   s.ios.deployment_target = '10.0'
 
@@ -20,6 +19,6 @@ A leading attribution solution that brings the full power of mobile ad measureme
   s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64'}
   s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64'}
 
-  s.dependency 'Adjust', '4.28.0'
+  s.dependency 'Adjust', '4.29.7'
   s.dependency 'ACPCore'
 end
diff --git a/AdjustAdobeExtension/Classes/AdjustAdobeExtension.h b/AdjustAdobeExtension/Classes/AdjustAdobeExtension.h
@@ -3,7 +3,7 @@
 //  AdjustAdobeExtension
 //
 //  Created by Ricardo Carvalho (@rabc) on 09/04/2020.
-//  Copyright (c) 2020 Adjust GmbH. All rights reserved.
+//  Copyright (c) 2020-Present Adjust GmbH. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

diff --git a/AdjustAdobeExtension/Classes/AdjustAdobeExtension.m b/AdjustAdobeExtension/Classes/AdjustAdobeExtension.m
@@ -3,15 +3,15 @@
 //  AdjustAdobeExtension
 //
 //  Created by Ricardo Carvalho (@rabc) on 09/04/2020.
-//  Copyright (c) 2020 Adjust GmbH. All rights reserved.
+//  Copyright (c) 2020-Present Adjust GmbH. All rights reserved.
 //
 
 #import "AdjustAdobeExtension.h"
 #import "AdjustAdobeExtensionSharedStateListener.h"
 #import "AdjustAdobeExtensionEventListener.h"
 
 NSString * const ADJAdobeExtensionLogTag = @"AdjustAdobeExtension";
-NSString * const ADJAdobeExtensionSdkPrefix = @"adobe_ext1.0.0";
+NSString * const ADJAdobeExtensionSdkPrefix = @"adobe_ext1.0.3";
 
 NSString * const ADJAdobeAdjustEventToken = @"adj.eventToken";
 NSString * const ADJAdobeAdjustEventCurrency = @"adj.currency";

diff --git a/AdjustAdobeExtension/Classes/AdjustAdobeExtensionConfig.h b/AdjustAdobeExtension/Classes/AdjustAdobeExtensionConfig.h
@@ -3,7 +3,7 @@
 //  AdjustAdobeExtension
 //
 //  Created by Ricardo Carvalho (@rabc) on 01/10/2020.
-//  Copyright (c) 2020 Adjust GmbH. All rights reserved.
+//  Copyright (c) 2020-Present Adjust GmbH. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

diff --git a/AdjustAdobeExtension/Classes/AdjustAdobeExtensionConfig.m b/AdjustAdobeExtension/Classes/AdjustAdobeExtensionConfig.m
@@ -3,7 +3,7 @@
 //  AdjustAdobeExtension
 //
 //  Created by Ricardo Carvalho (@rabc) on 01/10/2020.
-//  Copyright (c) 2020 Adjust GmbH. All rights reserved.
+//  Copyright (c) 2020-Present Adjust GmbH. All rights reserved.
 //
 
 #import "AdjustAdobeExtensionConfig.h"

diff --git a/AdjustAdobeExtension/Classes/AdjustAdobeExtensionEventListener.h b/AdjustAdobeExtension/Classes/AdjustAdobeExtensionEventListener.h
@@ -3,7 +3,7 @@
 //  AdjustAdobeExtension
 //
 //  Created by Ricardo Carvalho (@rabc) on 28/09/2020.
-//  Copyright (c) 2020 Adjust GmbH. All rights reserved.
+//  Copyright (c) 2020-Present Adjust GmbH. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

diff --git a/AdjustAdobeExtension/Classes/AdjustAdobeExtensionEventListener.m b/AdjustAdobeExtension/Classes/AdjustAdobeExtensionEventListener.m
@@ -3,7 +3,7 @@
 //  AdjustAdobeExtension
 //
 //  Created by Ricardo Carvalho (@rabc) on 28/09/2020.
-//  Copyright (c) 2020 Adjust GmbH. All rights reserved.
+//  Copyright (c) 2020-Present Adjust GmbH. All rights reserved.
 //
 
 #import "AdjustAdobeExtensionEventListener.h"

diff --git a/AdjustAdobeExtension/Classes/AdjustAdobeExtensionSharedStateListener.h b/AdjustAdobeExtension/Classes/AdjustAdobeExtensionSharedStateListener.h
@@ -3,7 +3,7 @@
 //  AdjustAdobeExtension
 //
 //  Created by Ricardo Carvalho (@rabc) on 04/09/2020.
-//  Copyright (c) 2020 Adjust GmbH. All rights reserved.
+//  Copyright (c) 2020-Present Adjust GmbH. All rights reserved.
 //
 
 #import <ACPCore/ACPCore.h>

diff --git a/AdjustAdobeExtension/Classes/AdjustAdobeExtensionSharedStateListener.m b/AdjustAdobeExtension/Classes/AdjustAdobeExtensionSharedStateListener.m
@@ -3,7 +3,7 @@
 //  AdjustAdobeExtension
 //
 //  Created by Ricardo Carvalho (@rabc) on 04/09/2020.
-//  Copyright (c) 2020 Adjust GmbH. All rights reserved.
+//  Copyright (c) 2020-Present Adjust GmbH. All rights reserved.
 //
 
 #import "AdjustAdobeExtensionSharedStateListener.h"
@@ -32,9 +32,11 @@ - (void)hear:(ACPExtensionEvent *)event {
         [self.extension.api getSharedEventState:ADJAdobeModuleConfiguration event:event error:&error];
 
     if (error) {
-        [ACPCore log:ACPMobileLogLevelError tag:ADJAdobeExtensionLogTag
-             message:[NSString stringWithFormat:@"Error on getSharedEventState %@:%ld.",
-                      [error domain], [error code]]];
+        [ACPCore log:ACPMobileLogLevelError
+                 tag:ADJAdobeExtensionLogTag
+             message:[NSString stringWithFormat:@"Error on getSharedEventState %@:%zd.",
+                      [error domain],
+                      [error code]]];
         return;
     }
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,17 +1,24 @@
+### Version 1.0.3 (25th February 2022)
+#### Added
+- Added Xcode 13 compatibility.
+
+#### Native iOS SDK
+- [iOS@v4.29.7](https://github.com/adjust/ios_sdk/tree/v4.29.7)
+
+---
+
 ### Version 1.0.0 (3rd December 2020)
 #### Added
 - Official release of the Adjust iOS SDK Adobe Extension.
 
 #### Native iOS SDK
-- [iOS@v4.23.2][ios_sdk_v4.23.2]
+- [iOS@v4.23.2](https://github.com/adjust/ios_sdk/tree/v4.23.2)
 
-[ios_sdk_v4.23.2]: https://github.com/adjust/ios_sdk/tree/v4.23.2
+---
 
 ### Version 0.0.1 (3rd December 2020)
 #### Added
 - Pre release of the Adjust iOS SDK Adobe Extension.
 
 #### Native iOS SDK
-- [iOS@v4.23.2][ios_sdk_v4.23.2]
-
-[ios_sdk_v4.23.2]: https://github.com/adjust/ios_sdk/tree/v4.23.2
+- [iOS@v4.23.2](https://github.com/adjust/ios_sdk/tree/v4.23.2)
diff --git a/Example/AdjustAdobeExtension.xcodeproj/project.pbxproj b/Example/AdjustAdobeExtension.xcodeproj/project.pbxproj
@@ -23,6 +23,7 @@
 		697B6A5A20455A49689B5607 /* Pods_AdjustAdobeExtension_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0CECA2AA08EBD04AC2832013 /* Pods_AdjustAdobeExtension_Tests.framework */; };
 		71719F9F1E33DC2100824A3D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 71719F9D1E33DC2100824A3D /* LaunchScreen.storyboard */; };
 		873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 873B8AEA1B1F5CCA007FD442 /* Main.storyboard */; };
+		9D8673CA27BC75110055E47D /* AdServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9D8673C927BC75110055E47D /* AdServices.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		CD4565A57237A69790816829 /* Pods_AdjustAdobeExtension_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AD6418977B7A30D4CB4365B3 /* Pods_AdjustAdobeExtension_Example.framework */; };
 /* End PBXBuildFile section */
 
@@ -63,6 +64,7 @@
 		71719F9E1E33DC2100824A3D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		82B4F456CA3BD9B3DF05BFB3 /* Pods-AdjustAdobeExtension_Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AdjustAdobeExtension_Example.debug.xcconfig"; path = "Target Support Files/Pods-AdjustAdobeExtension_Example/Pods-AdjustAdobeExtension_Example.debug.xcconfig"; sourceTree = "<group>"; };
 		873B8AEA1B1F5CCA007FD442 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Main.storyboard; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+		9D8673C927BC75110055E47D /* AdServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdServices.framework; path = System/Library/Frameworks/AdServices.framework; sourceTree = SDKROOT; };
 		AD6418977B7A30D4CB4365B3 /* Pods_AdjustAdobeExtension_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AdjustAdobeExtension_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		BCB513ED41AE8008A08DDD29 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ../LICENSE; sourceTree = "<group>"; };
 		C11450EF9B65E9C58BFBFC01 /* AdjustAdobeExtension.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = AdjustAdobeExtension.podspec; path = ../AdjustAdobeExtension.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
@@ -75,6 +77,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				9D8673CA27BC75110055E47D /* AdServices.framework in Frameworks */,
 				6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */,
 				6003F592195388D20070C39A /* UIKit.framework in Frameworks */,
 				6003F58E195388D20070C39A /* Foundation.framework in Frameworks */,
@@ -121,6 +124,7 @@
 		6003F58C195388D20070C39A /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				9D8673C927BC75110055E47D /* AdServices.framework */,
 				6003F58D195388D20070C39A /* Foundation.framework */,
 				6003F58F195388D20070C39A /* CoreGraphics.framework */,
 				6003F591195388D20070C39A /* UIKit.framework */,
@@ -246,7 +250,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = ADJ;
-				LastUpgradeCheck = 1210;
+				LastUpgradeCheck = 1320;
 				ORGANIZATIONNAME = rabc;
 				TargetAttributes = {
 					6003F589195388D20070C39A = {

diff --git a/...justAdobeExtension.xcodeproj/xcshareddata/xcschemes/AdjustAdobeExtension-Example.xcscheme b/...justAdobeExtension.xcodeproj/xcshareddata/xcschemes/AdjustAdobeExtension-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1210"
+   LastUpgradeVersion = "1320"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Example/AdjustAdobeExtension/ADJViewController.m b/Example/AdjustAdobeExtension/ADJViewController.m
@@ -19,8 +19,10 @@ @implementation ADJViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
 
-    [ACPCore trackAction:@"TestAction" data:@{@"a": @"b", ADJAdobeAdjustEventToken: @"g3mfiw"}];
-    [ACPCore trackAction:@"TestActionRevenue" data:@{@"a": @"b", ADJAdobeAdjustEventToken: @"a4fd35",
+    [ACPCore trackAction:@"TestAction" data:@{@"a": @"b",
+                                              ADJAdobeAdjustEventToken: @"g3mfiw"}];
+    [ACPCore trackAction:@"TestActionRevenue" data:@{@"a": @"b",
+                                                     ADJAdobeAdjustEventToken: @"a4fd35",
                                                      ADJAdobeAdjustEventRevenue: @"1.0",
                                                      ADJAdobeAdjustEventCurrency: @"EUR"}];
     [ACPCore trackState:@"TestState" data:@{@"a": @"b"}];

diff --git a/Example/Podfile b/Example/Podfile
@@ -10,7 +10,5 @@ target 'AdjustAdobeExtension_Example' do
 
   target 'AdjustAdobeExtension_Tests' do
     inherit! :search_paths
-
-
   end
 end
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,23 +1,23 @@
 PODS:
-  - ACPCore (2.7.5):
-    - ACPCore/main (= 2.7.5)
-  - ACPCore/main (2.7.5)
-  - ACPGriffon (1.2.0):
+  - ACPCore (2.9.5):
+    - ACPCore/main (= 2.9.5)
+  - ACPCore/main (2.9.5)
+  - ACPGriffon (1.2.1):
     - ACPCore
-    - ACPGriffon/iOS (= 1.2.0)
-  - ACPGriffon/iOS (1.2.0):
+    - ACPGriffon/iOS (= 1.2.1)
+  - ACPGriffon/iOS (1.2.1):
     - ACPCore
-  - ACPUserProfile (2.1.0):
-    - ACPCore (~> 2.0)
-    - ACPUserProfile/iOS (= 2.1.0)
-  - ACPUserProfile/iOS (2.1.0):
-    - ACPCore (~> 2.0)
-  - Adjust (4.23.1):
-    - Adjust/Core (= 4.23.1)
-  - Adjust/Core (4.23.1)
-  - AdjustAdobeExtension (0.1.0):
+  - ACPUserProfile (2.2.0):
+    - ACPCore (>= 2.9.0)
+    - ACPUserProfile/xcframeworks (= 2.2.0)
+  - ACPUserProfile/xcframeworks (2.2.0):
+    - ACPCore (>= 2.9.0)
+  - Adjust (4.29.7):
+    - Adjust/Core (= 4.29.7)
+  - Adjust/Core (4.29.7)
+  - AdjustAdobeExtension (1.0.3):
     - ACPCore
-    - Adjust
+    - Adjust (= 4.29.7)
 
 DEPENDENCIES:
   - ACPCore (~> 2.0)
@@ -37,12 +37,12 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  ACPCore: 5608edce9d9bdef01da9a19201993fdb144dccf8
-  ACPGriffon: 53b524a9366c34968cce9b4eba50cbf72d0221d8
-  ACPUserProfile: 934b0d8136dc8b4c71e95c347ae733c4482d5b9d
-  Adjust: 0dc7b2815625e391897a31ab9e1e41dcc4cd99a2
-  AdjustAdobeExtension: 12388164e07dab450333ef6069c9bcfc216be53a
+  ACPCore: f6c5ec32fe162e61a18bec2ae79c8c5a48362a46
+  ACPGriffon: 5b46aa44e9667b1ff5d35aa37a84992b58d2aadf
+  ACPUserProfile: 34bd51d00a2ae1add3d04eab0a313b73cb01b904
+  Adjust: 91a06a01e4bb35b432e26b5d5bb8995b95fc381c
+  AdjustAdobeExtension: 97a4e60f2aab26c4c0093bca6588e4992286d44e
 
-PODFILE CHECKSUM: e374d4d0cc30b86d1419d237e233decc9ed70c1d
+PODFILE CHECKSUM: 9d0e231ac981dcf17cb67e756778f0a8f6f6332c
 
-COCOAPODS: 1.9.3
+COCOAPODS: 1.11.2
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2020 Adjust GmbH, http://www.adjust.com
+Copyright (c) 2020-Present Adjust GmbH, http://www.adjust.com
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.0
+1.0.3