From 90cba7c41bc2f696d83727182fa4738b9238750c Mon Sep 17 00:00:00 2001 From: emawby Date: Mon, 24 Jul 2023 11:04:58 -0700 Subject: [PATCH] Fixing double vendoring of OneSignalFramework --- OneSignal.podspec | 10 ++++++++-- OneSignalXCFramework.podspec | 9 +++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/OneSignal.podspec b/OneSignal.podspec index 3e5363717..0da609052 100755 --- 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 index 6edd24486..4cc7feba6 100644 --- 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