Integrate modules into Xcode and Podspec

sushichop · Jun 14, 2021 · edbe4ae · edbe4ae
1 parent 6dcccca
commit edbe4ae
Show file tree

Hide file tree

Showing 13 changed files with 428 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Use `AnyObject` for protocol inheritance instead of `class`. [#13](https://github.com/sushichop/Puppy/pull/13)
 - Add `carthage-build-xcframeworks`. [#14](https://github.com/sushichop/Puppy/pull/14)
 - Specify Linux platform. [#15](https://github.com/sushichop/Puppy/pull/15)
+- Integrate modules in Xcode and Podspec. [#16](https://github.com/sushichop/Puppy/pull/16)
 
 ## [0.1.2](https://github.com/sushichop/Puppy/releases/tag/0.1.2) (2020-12-05)
 

diff --git a/Configurations/Framework.xcconfig b/Configurations/Framework.xcconfig
@@ -4,7 +4,9 @@ PRODUCT_NAME = $(PROJECT_NAME)
 PRODUCT_BUNDLE_IDENTIFIER = $(SCP_PRODUCT_BUNDLE_IDENTIFIER_PREFIX).$(PRODUCT_NAME:rfc1034identifier)
 INFOPLIST_FILE = $(SRCROOT)/Sources/SupportingFiles/Info.plist
 
-//MODULEMAP_FILE = $(SRCROOT)/Sources/SupportingFiles/$(PRODUCT_NAME).modulemap
+MACH_O_TYPE = mh_dylib
+//MODULEMAP_FILE = $(SRCROOT)/Sources/$(PRODUCT_NAME)/$(PRODUCT_NAME).modulemap
+
 APPLICATION_EXTENSION_API_ONLY = YES
 
 ENABLE_BITCODE = YES

diff --git a/Configurations/FrameworkTests.xcconfig b/Configurations/FrameworkTests.xcconfig
@@ -3,3 +3,5 @@
 PRODUCT_NAME = $(PROJECT_NAME)Tests
 PRODUCT_BUNDLE_IDENTIFIER = $(SCP_PRODUCT_BUNDLE_IDENTIFIER_PREFIX).$(PRODUCT_NAME:rfc1034identifier)
 INFOPLIST_FILE = $(SRCROOT)/Tests/SupportingFiles/Info.plist
+
+MACH_O_TYPE = mh_bundle
diff --git a/Configurations/StaticFramework.xcconfig b/Configurations/StaticFramework.xcconfig
@@ -0,0 +1,14 @@
+#include "Common.xcconfig"
+
+PRODUCT_NAME = C$(PROJECT_NAME)
+PRODUCT_BUNDLE_IDENTIFIER = $(SCP_PRODUCT_BUNDLE_IDENTIFIER_PREFIX).$(PRODUCT_NAME:rfc1034identifier)
+INFOPLIST_FILE = $(SRCROOT)/Sources/SupportingFiles/Info.plist
+
+MACH_O_TYPE = staticlib
+MODULEMAP_FILE = $(SRCROOT)/Sources/$(PRODUCT_NAME)/$(PRODUCT_NAME).modulemap
+
+APPLICATION_EXTENSION_API_ONLY = YES
+
+ENABLE_BITCODE = YES
+BITCODE_GENERATION_MODE = bitcode
+OTHER_CFLAGS = -fembed-bitcode
diff --git a/Configurations/StaticFrameworkTests.xcconfig b/Configurations/StaticFrameworkTests.xcconfig
@@ -0,0 +1,7 @@
+#include "Common.xcconfig"
+
+PRODUCT_NAME = C$(PROJECT_NAME)Tests
+PRODUCT_BUNDLE_IDENTIFIER = $(SCP_PRODUCT_BUNDLE_IDENTIFIER_PREFIX).$(PRODUCT_NAME:rfc1034identifier)
+INFOPLIST_FILE = $(SRCROOT)/Tests/SupportingFiles/Info.plist
+
+MACH_O_TYPE = mh_bundle
diff --git a/Puppy.podspec b/Puppy.podspec
@@ -22,7 +22,9 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "Core" do |core|
-    core.source_files = "Sources/Puppy/**/*.{swift}"
+    core.header_mappings_dir = "Sources/CPuppy/include"
+    core.public_header_files = "Sources/CPuppy/include/**/*.h"
+    core.source_files        = "Sources/CPuppy/**/*.{h,m}", "Sources/Puppy/**/*.{swift}"
   end
 
   s.cocoapods_version = ">= 1.7.0"