Merge pull request #1281 from OneSignal/fixing_distribution_of_xcfram…

…ework Fixing Multiple Commands Produce cocoapods build issue
OneSignal · Oct 30, 2023 · 2429766 · 2429766
2 parents 6826f46 + d7ff2e1
commit 2429766
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/OneSignal.podspec b/OneSignal.podspec
@@ -9,8 +9,8 @@ Pod::Spec.new do |s|
   s.source           = { :git => "https://github.com/OneSignal/OneSignal-iOS-SDK.git", :tag => s.version.to_s }
   s.platform         = :ios, "11.0"
   s.requires_arc     = true
-
-  s.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignalFramework.xcframework'
+  s.default_subspec = "OneSignalComplete"
+    
     s.subspec 'OneSignalCore' do |ss|
       ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Core/OneSignalCore.xcframework'
     end
@@ -72,4 +72,10 @@ Pod::Spec.new do |s|
       ss.dependency 'OneSignal/OneSignalUser'
       ss.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignalFramework.xcframework'
     end
+
+    s.subspec 'OneSignalComplete' do |ss|
+      ss.dependency 'OneSignal/OneSignal'
+      ss.dependency 'OneSignal/OneSignalLocation'
+      ss.dependency 'OneSignal/OneSignalInAppMessages'
+    end
 end
diff --git a/OneSignalXCFramework.podspec b/OneSignalXCFramework.podspec
@@ -9,8 +9,7 @@ Pod::Spec.new do |s|
     s.source           = { :git => "https://github.com/OneSignal/OneSignal-iOS-SDK.git", :tag => s.version.to_s }
     s.platform         = :ios, '11.0'
     s.requires_arc     = true
-
-    s.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignalFramework.xcframework'
+    s.default_subspec = "OneSignalComplete"
 
     s.subspec 'OneSignalCore' do |ss|
       ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Core/OneSignalCore.xcframework'
@@ -73,4 +72,10 @@ Pod::Spec.new do |s|
       ss.dependency 'OneSignalXCFramework/OneSignalUser'
       ss.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignalFramework.xcframework'
     end
+
+    s.subspec 'OneSignalComplete' do |ss|
+      ss.dependency 'OneSignalXCFramework/OneSignal'
+      ss.dependency 'OneSignalXCFramework/OneSignalLocation'
+      ss.dependency 'OneSignalXCFramework/OneSignalInAppMessages'
+    end
 end