Merge pull request #1062 from OneSignal/feature/modular_subspecs

Use subspecs for modular cocoapods distribution

Author: emawby

OneSignal.podspec

@@ -8,7 +8,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
+  s.platform         = :ios, "9.0"
   s.requires_arc     = true
 
   s.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/Framework/OneSignal.framework'

OneSignalCore.podspec

@@ -7,15 +7,28 @@ Pod::Spec.new do |s|
     s.author           = { "Joseph Kalash" => "[email protected]", "Josh Kasten" => "[email protected]" , "Brad Hesse" => "[email protected]"}
 
     s.source           = { :git => "https://github.com/OneSignal/OneSignal-iOS-SDK.git", :tag => s.version.to_s }
-    s.platform         = :ios
+    s.platform         = :ios, '9.0'
     s.requires_arc     = true
-
-    s.dependency 'OneSignalCore'
-    s.dependency 'OneSignalOutcomes'
-    s.dependency 'OneSignalExtension'
 
     s.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework'
-    s.preserve_paths = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework'
-    
+    #s.preserve_paths = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignal.xcframework'
+
+    s.subspec 'OneSignalCore' do |ss|
+      ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Core/OneSignalCore.xcframework'
+      #ss.preserve_paths = 'iOS_SDK/OneSignalSDK/OneSignal_Core/OneSignalCore.xcframework'
+    end
+
+    s.subspec 'OneSignalOutcomes' do |ss|
+      ss.dependency 'OneSignalXCFramework/OneSignalCore'
+      ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Outcomes/OneSignalOutcomes.xcframework'
+      #ss.preserve_paths = 'iOS_SDK/OneSignalSDK/OneSignal_Outcomes/OneSignalOutcomes.xcframework'
+    end
+
+    s.subspec 'OneSignalExtension' do |ss|
+      ss.dependency 'OneSignalXCFramework/OneSignalCore'
+      ss.dependency 'OneSignalXCFramework/OneSignalOutcomes'
+      ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Extension/OneSignalExtension.xcframework'
+      #ss.preserve_paths = 'iOS_SDK/OneSignalSDK/OneSignal_Extension/OneSignalExtension.xcframework'
+    end
   end
 

OneSignalDynamic.podspec

@@ -949,6 +949,9 @@
 		DE98772A2591655800DE07D5 /* NSDateFormatter+OneSignal.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSDateFormatter+OneSignal.m"; sourceTree = "<group>"; };
 		DE9A5DA925D1FD6B00FCEC21 /* OSPlayerTags.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSPlayerTags.h; sourceTree = "<group>"; };
 		DE9A5DB225D1FD8000FCEC21 /* OSPlayerTags.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OSPlayerTags.m; sourceTree = "<group>"; };
+		DEB843A127C0245B00D7E943 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		DEB843A327C0246A00D7E943 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		DEB843A527C0247700D7E943 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		DEF5CCF12539321A0003E9CC /* UnitTestApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = UnitTestApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		DEF5CCF32539321A0003E9CC /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		DEF5CCF42539321A0003E9CC /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -1701,20 +1704,23 @@
 		DE97175A275597D100FC409E /* OneSignalCoreFramework */ = {
 			isa = PBXGroup;
 			children = (
+				DEB843A127C0245B00D7E943 /* Info.plist */,
 			);
 			path = OneSignalCoreFramework;
 			sourceTree = "<group>";
 		};
 		DE97175B275597DA00FC409E /* OneSignalOutcomesFramework */ = {
 			isa = PBXGroup;
 			children = (
+				DEB843A327C0246A00D7E943 /* Info.plist */,
 			);
 			path = OneSignalOutcomesFramework;
 			sourceTree = "<group>";
 		};
 		DE97175C275597E600FC409E /* OneSignalExtensionFramework */ = {
 			isa = PBXGroup;
 			children = (
+				DEB843A527C0247700D7E943 /* Info.plist */,
 			);
 			path = OneSignalExtensionFramework;
 			sourceTree = "<group>";
@@ -3000,7 +3006,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GENERATE_INFOPLIST_FILE = YES;
+				GENERATE_INFOPLIST_FILE = NO;
 				INFOPLIST_FILE = OneSignalCoreFramework/Info.plist;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2021 Hiptic. All rights reserved.";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -3062,7 +3068,7 @@
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				GENERATE_INFOPLIST_FILE = YES;
+				GENERATE_INFOPLIST_FILE = NO;
 				INFOPLIST_FILE = OneSignalCoreFramework/Info.plist;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2021 Hiptic. All rights reserved.";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -3116,7 +3122,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GENERATE_INFOPLIST_FILE = YES;
+				GENERATE_INFOPLIST_FILE = NO;
 				INFOPLIST_FILE = OneSignalExtensionFramework/Info.plist;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2021 Hiptic. All rights reserved.";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -3176,7 +3182,7 @@
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				GENERATE_INFOPLIST_FILE = YES;
+				GENERATE_INFOPLIST_FILE = NO;
 				INFOPLIST_FILE = OneSignalExtensionFramework/Info.plist;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2021 Hiptic. All rights reserved.";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -3230,7 +3236,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GENERATE_INFOPLIST_FILE = YES;
+				GENERATE_INFOPLIST_FILE = NO;
 				INFOPLIST_FILE = OneSignalOutcomesFramework/Info.plist;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2021 Hiptic. All rights reserved.";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -3290,7 +3296,7 @@
 					"DEBUG=1",
 					"$(inherited)",
 				);
-				GENERATE_INFOPLIST_FILE = YES;
+				GENERATE_INFOPLIST_FILE = NO;
 				INFOPLIST_FILE = OneSignalOutcomesFramework/Info.plist;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2021 Hiptic. All rights reserved.";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

OneSignalExtension.podspec

@@ -8,15 +8,12 @@ BUILD_TYPE="staticlib"
 BUILD_SCHEME="OneSignalFramework"
 BUILD_PROJECT="OneSignal.xcodeproj"
 
-# NOTE: Once Apple drops support for Xcode 10, we can edit this to use same xcodebuild version for all three build commands
-XCODEBUILD_OLDEST_SUPPORTED=/Applications/Xcode10.1.app/Contents/Developer/usr/bin/xcodebuild
-XCODEBUILD_11_0=/Applications/Xcode11.0.app/Contents/Developer/usr/bin/xcodebuild
+# NOTE: We are now supporting Xcode 11 as our oldest build target.
+XCODEBUILD_OLDEST_SUPPORTED=/Applications/Xcode11.0.app/Contents/Developer/usr/bin/xcodebuild
 
-# For backwards compatible bitcode we need to build iphonesimulator + iphoneos with 3 versions behind the latest.
-#       However variant=Mac Catalyst needs to be be Xcode 11.0
 $XCODEBUILD_OLDEST_SUPPORTED -configuration ${BUILD_CONFIG} MACH_O_TYPE=${BUILD_TYPE} -sdk "iphonesimulator" ARCHS="x86_64 i386" -project ${BUILD_PROJECT} -scheme ${BUILD_SCHEME} SYMROOT="${DERIVED_DATA_RELATIVE_DIR}/"
 $XCODEBUILD_OLDEST_SUPPORTED -configuration ${BUILD_CONFIG} MACH_O_TYPE=${BUILD_TYPE} -sdk "iphoneos" ARCHS="armv7 armv7s arm64 arm64e"  -project ${BUILD_PROJECT} -scheme ${BUILD_SCHEME} SYMROOT="${DERIVED_DATA_RELATIVE_DIR}/"
-$XCODEBUILD_11_0 -configuration ${BUILD_CONFIG} ARCHS="x86_64h" VALID_ARCHS="x86_64h" -destination 'platform=macOS,variant=Mac Catalyst' MACH_O_TYPE=${BUILD_TYPE} -project ${BUILD_PROJECT} -scheme ${BUILD_SCHEME} SYMROOT="${DERIVED_DATA_RELATIVE_DIR}/"
+$XCODEBUILD_OLDEST_SUPPORTED -configuration ${BUILD_CONFIG} ARCHS="x86_64h" VALID_ARCHS="x86_64h" -destination 'platform=macOS,variant=Mac Catalyst' MACH_O_TYPE=${BUILD_TYPE} -project ${BUILD_PROJECT} -scheme ${BUILD_SCHEME} SYMROOT="${DERIVED_DATA_RELATIVE_DIR}/"
 
 USER=$(id -un)
 DERIVED_DATA_ONESIGNAL_DIR="${WORKING_DIR}/${DERIVED_DATA_RELATIVE_DIR}"

OneSignalOutcomes.podspec

@@ -22,6 +22,10 @@ SWIFT_PACKAGE_DIRECTORY="${WORKING_DIR}/../.."
 
 SWIFT_PACKAGE_PATH="${SWIFT_PACKAGE_DIRECTORY}/Package.swift"
 
+#Ask for the new release version number to be placed in the package URL
+echo -e "\033[1mEnter the new SDK release version number\033[0m"
+read VERSION_NUMBER
+
 # Remove the old Zipped XCFramework and create a new Zip
 echo "Removing old Zipped XCFramework ${FRAMEWORK_ZIP_PATH}"
 rm -rf "${FRAMEWORK_ZIP_PATH}"
@@ -35,9 +39,6 @@ SWIFT_PM_CHECKSUM_LINE="          checksum: \"${CHECKSUM}\""
 
 # Use sed to remove line 62 from the Swift.package and replace it with the new checksum
 sed -i '' "62s/.*/$SWIFT_PM_CHECKSUM_LINE/" "${SWIFT_PACKAGE_PATH}"
-#Ask for the new release version number to be placed in the package URL
-echo -e "\033[1mEnter the new SDK release version number\033[0m"
-read VERSION_NUMBER
 SWIFT_PM_URL_LINE="          url: \"https:\/\/github.com\/OneSignal\/OneSignal-iOS-SDK\/releases\/download\/${VERSION_NUMBER}\/OneSignalCore.xcframework.zip\","
 #Use sed to remove line 61 from the Swift.package and replace it with the new URL for the new release
 sed -i '' "61s/.*/$SWIFT_PM_URL_LINE/" "${SWIFT_PACKAGE_PATH}"
@@ -77,9 +78,6 @@ SWIFT_PM_CHECKSUM_LINE="          checksum: \"${CHECKSUM}\""
 echo ${CHECKSUM}
 # Use sed to remove line 57 from the Swift.package and replace it with the new checksum
 sed -i '' "57s/.*/$SWIFT_PM_CHECKSUM_LINE/" "${SWIFT_PACKAGE_PATH}"
-#Ask for the new release version number to be placed in the package URL
-echo -e "\033[1mEnter the new SDK release version number\033[0m"
-read VERSION_NUMBER
 SWIFT_PM_URL_LINE="          url: \"https:\/\/github.com\/OneSignal\/OneSignal-iOS-SDK\/releases\/download\/${VERSION_NUMBER}\/OneSignalOutcomes.xcframework.zip\","
 #Use sed to remove line 56 from the Swift.package and replace it with the new URL for the new release
 sed -i '' "56s/.*/$SWIFT_PM_URL_LINE/" "${SWIFT_PACKAGE_PATH}"
@@ -119,9 +117,6 @@ SWIFT_PM_CHECKSUM_LINE="          checksum: \"${CHECKSUM}\""
 echo ${CHECKSUM}
 # Use sed to remove line 52 from the Swift.package and replace it with the new checksum
 sed -i '' "52s/.*/$SWIFT_PM_CHECKSUM_LINE/" "${SWIFT_PACKAGE_PATH}"
-#Ask for the new release version number to be placed in the package URL
-echo -e "\033[1mEnter the new SDK release version number\033[0m"
-read VERSION_NUMBER
 SWIFT_PM_URL_LINE="          url: \"https:\/\/github.com\/OneSignal\/OneSignal-iOS-SDK\/releases\/download\/${VERSION_NUMBER}\/OneSignalExtension.xcframework.zip\","
 #Use sed to remove line 51 from the Swift.package and replace it with the new URL for the new release
 sed -i '' "51s/.*/$SWIFT_PM_URL_LINE/" "${SWIFT_PACKAGE_PATH}"
@@ -161,9 +156,6 @@ SWIFT_PM_CHECKSUM_LINE="          checksum: \"${CHECKSUM}\""
 echo ${CHECKSUM}
 # Use sed to remove line 47 from the Swift.package and replace it with the new checksum
 sed -i '' "47s/.*/$SWIFT_PM_CHECKSUM_LINE/" "${SWIFT_PACKAGE_PATH}"
-#Ask for the new release version number to be placed in the package URL
-echo -e "\033[1mEnter the new SDK release version number\033[0m"
-read VERSION_NUMBER
 SWIFT_PM_URL_LINE="          url: \"https:\/\/github.com\/OneSignal\/OneSignal-iOS-SDK\/releases\/download\/${VERSION_NUMBER}\/OneSignal.xcframework.zip\","
 #Use sed to remove line 46 from the Swift.package and replace it with the new URL for the new release
 sed -i '' "46s/.*/$SWIFT_PM_URL_LINE/" "${SWIFT_PACKAGE_PATH}"