Merge pull request #724 from adjust/v500

Version 5.0.0
adjust · Aug 2, 2024 · 81037ba · 81037ba
2 parents e163732 + 800237f
commit 81037ba
Show file tree

Hide file tree

Showing 288 changed files with 7,905 additions and 12,898 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,3 +34,4 @@ uncrustify.cfg
 
 #SPM
 .swiftpm/
+Package.resolved
diff --git a/Adjust.podspec b/Adjust.podspec
@@ -1,43 +1,36 @@
 Pod::Spec.new do |s|
-  s.name           = "Adjust"
-  s.version        = "4.38.4"
-  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         = { "Adjust" => "[email protected]" }
-  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.38.4" }
-  s.ios.deployment_target = '9.0'
-  s.tvos.deployment_target = '9.0'
-  s.framework      = 'SystemConfiguration'
-  s.ios.weak_framework = 'AdSupport'
-  s.tvos.weak_framework = 'AdSupport'
-  s.requires_arc   = true
-  s.default_subspec = 'Core'
-  s.pod_target_xcconfig = { 'BITCODE_GENERATION_MODE' => 'bitcode' }
+  s.name                    = "Adjust"
+  s.module_name             = "AdjustSdk"
+  s.version                 = "5.0.0"
+  s.summary                 = "This is the iOS SDK of Adjust. You can read more about it at https://adjust.com."
+  s.homepage                = "https://github.com/adjust/ios_sdk"
+  s.license                 = { :type => 'MIT', :file => 'LICENSE' }
+  s.author                  = { "Adjust" => "[email protected]" }
+  s.source                  = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v#{s.version}" }
+  s.ios.deployment_target   = '12.0'
+  s.tvos.deployment_target  = '12.0'
+  s.framework               = 'SystemConfiguration'
+  s.ios.weak_framework      = 'AdSupport'
+  s.tvos.weak_framework     = 'AdSupport'
+  s.default_subspec         = 'Adjust'
+  s.module_map              = 'ModuleMap/module.modulemap'
 
-  s.subspec 'Core' do |co|
-    co.source_files   = 'Adjust/*.{h,m}', 'Adjust/ADJAdditions/*.{h,m}'
-    co.resource_bundle = {'Adjust' => ['Adjust/*.xcprivacy']}
+  s.subspec 'Adjust' do |adj|
+    adj.source_files        = 'Adjust/**/*.{h,m}', 'UmbrellaHeaders/sdk/*.{h,m}'
+    adj.public_header_files = 'Adjust/*.h', 'UmbrellaHeaders/sdk/*.h'
+    adj.exclude_files       = 'Adjust/include/**/*.h'
+    adj.resource_bundle     = {'Adjust' => ['Adjust/*.xcprivacy']}
+    adj.header_dir          = 'AdjustSdk'
+    adj.dependency          'AdjustSignature', '~> 3.18'
   end
 
-  s.subspec 'Sociomantic' do |sm|
-    sm.source_files = 'plugin/Sociomantic/*.{h,m}'
-    sm.dependency 'Adjust/Core'
-  end
-
-  s.subspec 'Criteo' do |cr|
-    cr.source_files = 'plugin/Criteo/*.{h,m}'
-    cr.dependency 'Adjust/Core'
-  end
-
-  s.subspec 'Trademob' do |tm|
-    tm.source_files = 'plugin/Trademob/*.{h,m}'
-    tm.dependency 'Adjust/Core'
-  end
-
-  s.subspec 'WebBridge' do |wb|
-    wb.source_files = 'AdjustBridge/*.{h,m}', 'AdjustBridge/WebViewJavascriptBridge/*.{h,m}'
-    wb.dependency 'Adjust/Core'
-    wb.ios.deployment_target = '9.0'
+  s.subspec 'AdjustWebBridge' do |awb|
+    awb.source_files          = 'Adjust/**/*.{h,m}', 'AdjustBridge/*.{h,m}', 'UmbrellaHeaders/webbridge/*.{h,m}'
+    awb.public_header_files   = 'Adjust/*.h', 'AdjustBridge/*.h', 'UmbrellaHeaders/webbridge/*.h'
+    awb.exclude_files         = ['Adjust/include/**/*.h', 'AdjustBridge/include/**/*.h']
+    awb.resource_bundle       = {'Adjust' => ['Adjust/*.xcprivacy']}
+    awb.header_dir            = 'AdjustSdk'
+    awb.ios.deployment_target = '12.0'
+    awb.dependency            'AdjustSignature', '~> 3.18'
   end
 end
diff --git a/Adjust.xcodeproj/project.pbxproj b/Adjust.xcodeproj/project.pbxproj
diff --git a/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkIm.xcscheme b/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkIm.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "9DE354D12100726300D211C9"
-               BuildableName = "AdjustSdkIm.framework"
+               BuildableName = "AdjustSdk.framework"
                BlueprintName = "AdjustSdkIm"
                ReferencedContainer = "container:Adjust.xcodeproj">
             </BuildableReference>
@@ -44,7 +44,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "9DE354D12100726300D211C9"
-            BuildableName = "AdjustSdkIm.framework"
+            BuildableName = "AdjustSdk.framework"
             BlueprintName = "AdjustSdkIm"
             ReferencedContainer = "container:Adjust.xcodeproj">
          </BuildableReference>
@@ -60,7 +60,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "9DE354D12100726300D211C9"
-            BuildableName = "AdjustSdkIm.framework"
+            BuildableName = "AdjustSdk.framework"
             BlueprintName = "AdjustSdkIm"
             ReferencedContainer = "container:Adjust.xcodeproj">
          </BuildableReference>

diff --git a/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkTv.xcscheme b/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkTv.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "9DFB060F1D747070006D48FC"
-               BuildableName = "AdjustSdkTv.framework"
+               BuildableName = "AdjustSdk.framework"
                BlueprintName = "AdjustSdkTv"
                ReferencedContainer = "container:Adjust.xcodeproj">
             </BuildableReference>
@@ -44,7 +44,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "9DFB060F1D747070006D48FC"
-            BuildableName = "AdjustSdkTv.framework"
+            BuildableName = "AdjustSdk.framework"
             BlueprintName = "AdjustSdkTv"
             ReferencedContainer = "container:Adjust.xcodeproj">
          </BuildableReference>
@@ -60,7 +60,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "9DFB060F1D747070006D48FC"
-            BuildableName = "AdjustSdkTv.framework"
+            BuildableName = "AdjustSdk.framework"
             BlueprintName = "AdjustSdkTv"
             ReferencedContainer = "container:Adjust.xcodeproj">
          </BuildableReference>

diff --git a/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkWebBridge.xcscheme b/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkWebBridge.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "9D0E2E01210B570600133B4F"
-               BuildableName = "AdjustSdkWebBridge.framework"
+               BuildableName = "AdjustSdk.framework"
                BlueprintName = "AdjustSdkWebBridge"
                ReferencedContainer = "container:Adjust.xcodeproj">
             </BuildableReference>
@@ -44,7 +44,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "9D0E2E01210B570600133B4F"
-            BuildableName = "AdjustSdkWebBridge.framework"
+            BuildableName = "AdjustSdk.framework"
             BlueprintName = "AdjustSdkWebBridge"
             ReferencedContainer = "container:Adjust.xcodeproj">
          </BuildableReference>
@@ -60,7 +60,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "9D0E2E01210B570600133B4F"
-            BuildableName = "AdjustSdkWebBridge.framework"
+            BuildableName = "AdjustSdk.framework"
             BlueprintName = "AdjustSdkWebBridge"
             ReferencedContainer = "container:Adjust.xcodeproj">
          </BuildableReference>

diff --git a/Adjust/ADJAdditions/NSData+ADJAdditions.h b/Adjust/ADJAdditions/NSData+ADJAdditions.h
diff --git a/Adjust/ADJAdditions/NSData+ADJAdditions.m b/Adjust/ADJAdditions/NSData+ADJAdditions.m
diff --git a/Adjust/ADJAdditions/NSNumber+ADJAdditions.h b/Adjust/ADJAdditions/NSNumber+ADJAdditions.h
diff --git a/Adjust/ADJAdditions/NSNumber+ADJAdditions.m b/Adjust/ADJAdditions/NSNumber+ADJAdditions.m
diff --git a/Adjust/ADJAdditions/NSString+ADJAdditions.h b/Adjust/ADJAdditions/NSString+ADJAdditions.h
diff --git a/Adjust/ADJAdditions/NSString+ADJAdditions.m b/Adjust/ADJAdditions/NSString+ADJAdditions.m
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,3 +34,4 @@ uncrustify.cfg

		#SPM
		.swiftpm/
		Package.resolved