diff --git a/ios/NodeMobile.xcframework/Info.plist b/ios/NodeMobile.xcframework/Info.plist new file mode 100644 index 0000000..57cfde6 --- /dev/null +++ b/ios/NodeMobile.xcframework/Info.plist @@ -0,0 +1,40 @@ + + + + + AvailableLibraries + + + LibraryIdentifier + ios-arm64 + LibraryPath + NodeMobile.framework + SupportedArchitectures + + arm64 + + SupportedPlatform + ios + + + LibraryIdentifier + ios-arm64_x86_64-simulator + LibraryPath + NodeMobile.framework + SupportedArchitectures + + arm64 + x86_64 + + SupportedPlatform + ios + SupportedPlatformVariant + simulator + + + CFBundlePackageType + XFWK + XCFrameworkFormatVersion + 1.0 + + diff --git a/ios/NodeMobile.framework/Headers/NodeMobile.h b/ios/NodeMobile.xcframework/ios-arm64/NodeMobile.framework/Headers/NodeMobile.h similarity index 100% rename from ios/NodeMobile.framework/Headers/NodeMobile.h rename to ios/NodeMobile.xcframework/ios-arm64/NodeMobile.framework/Headers/NodeMobile.h diff --git a/ios/NodeMobile.framework/Info.plist b/ios/NodeMobile.xcframework/ios-arm64/NodeMobile.framework/Info.plist similarity index 65% rename from ios/NodeMobile.framework/Info.plist rename to ios/NodeMobile.xcframework/ios-arm64/NodeMobile.framework/Info.plist index 050de61..97c7ad5 100644 Binary files a/ios/NodeMobile.framework/Info.plist and b/ios/NodeMobile.xcframework/ios-arm64/NodeMobile.framework/Info.plist differ diff --git a/ios/NodeMobile.framework/Modules/module.modulemap b/ios/NodeMobile.xcframework/ios-arm64/NodeMobile.framework/Modules/module.modulemap similarity index 100% rename from ios/NodeMobile.framework/Modules/module.modulemap rename to ios/NodeMobile.xcframework/ios-arm64/NodeMobile.framework/Modules/module.modulemap diff --git a/ios/NodeMobile.xcframework/ios-arm64/NodeMobile.framework/NodeMobile b/ios/NodeMobile.xcframework/ios-arm64/NodeMobile.framework/NodeMobile new file mode 100755 index 0000000..4597d1b Binary files /dev/null and b/ios/NodeMobile.xcframework/ios-arm64/NodeMobile.framework/NodeMobile differ diff --git a/ios/NodeMobile.xcframework/ios-arm64_x86_64-simulator/NodeMobile.framework/Headers/NodeMobile.h b/ios/NodeMobile.xcframework/ios-arm64_x86_64-simulator/NodeMobile.framework/Headers/NodeMobile.h new file mode 100644 index 0000000..ee8b967 --- /dev/null +++ b/ios/NodeMobile.xcframework/ios-arm64_x86_64-simulator/NodeMobile.framework/Headers/NodeMobile.h @@ -0,0 +1,10 @@ + +#ifdef __cplusplus +extern "C" { +#endif + +int node_start(int argc, char *argv[]); + +#ifdef __cplusplus +} +#endif diff --git a/ios/NodeMobile.xcframework/ios-arm64_x86_64-simulator/NodeMobile.framework/Info.plist b/ios/NodeMobile.xcframework/ios-arm64_x86_64-simulator/NodeMobile.framework/Info.plist new file mode 100644 index 0000000..33f7edf Binary files /dev/null and b/ios/NodeMobile.xcframework/ios-arm64_x86_64-simulator/NodeMobile.framework/Info.plist differ diff --git a/ios/NodeMobile.xcframework/ios-arm64_x86_64-simulator/NodeMobile.framework/Modules/module.modulemap b/ios/NodeMobile.xcframework/ios-arm64_x86_64-simulator/NodeMobile.framework/Modules/module.modulemap new file mode 100644 index 0000000..739a5f2 --- /dev/null +++ b/ios/NodeMobile.xcframework/ios-arm64_x86_64-simulator/NodeMobile.framework/Modules/module.modulemap @@ -0,0 +1,6 @@ +framework module NodeMobile { + umbrella header "NodeMobile.h" + + export * + module * { export * } +} diff --git a/ios/NodeMobile.xcframework/ios-arm64_x86_64-simulator/NodeMobile.framework/NodeMobile b/ios/NodeMobile.xcframework/ios-arm64_x86_64-simulator/NodeMobile.framework/NodeMobile new file mode 100755 index 0000000..061f669 Binary files /dev/null and b/ios/NodeMobile.xcframework/ios-arm64_x86_64-simulator/NodeMobile.framework/NodeMobile differ diff --git a/ios/NodeMobile.xcframework/ios-arm64_x86_64-simulator/NodeMobile.framework/_CodeSignature/CodeResources b/ios/NodeMobile.xcframework/ios-arm64_x86_64-simulator/NodeMobile.framework/_CodeSignature/CodeResources new file mode 100644 index 0000000..7eb0d27 --- /dev/null +++ b/ios/NodeMobile.xcframework/ios-arm64_x86_64-simulator/NodeMobile.framework/_CodeSignature/CodeResources @@ -0,0 +1,132 @@ + + + + + files + + Headers/NodeMobile.h + + mF47sN2uVEfcc44M+Ts30qyt+sA= + + Info.plist + + dNLkq7z++0mFcV5koF9/yHP0fUY= + + Modules/module.modulemap + + LlklFmK+9CCXWP6ea9o221xO94Q= + + + files2 + + Headers/NodeMobile.h + + hash + + mF47sN2uVEfcc44M+Ts30qyt+sA= + + hash2 + + BLGBl3j2fTKtCcd+bJRpaMNIx7lO8YRfl3x+rVGo2W4= + + + Modules/module.modulemap + + hash + + LlklFmK+9CCXWP6ea9o221xO94Q= + + hash2 + + 3spVroB0IAFkCKGNs2U/lCeTGsB1jOpnMEnEVjV52Os= + + + + rules + + ^.* + + ^.*\.lproj/ + + optional + + weight + 1000 + + ^.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Base\.lproj/ + + weight + 1010 + + ^version.plist$ + + + rules2 + + .*\.dSYM($|/) + + weight + 11 + + ^(.*/)?\.DS_Store$ + + omit + + weight + 2000 + + ^.* + + ^.*\.lproj/ + + optional + + weight + 1000 + + ^.*\.lproj/locversion.plist$ + + omit + + weight + 1100 + + ^Base\.lproj/ + + weight + 1010 + + ^Info\.plist$ + + omit + + weight + 20 + + ^PkgInfo$ + + omit + + weight + 20 + + ^embedded\.provisionprofile$ + + weight + 20 + + ^version\.plist$ + + weight + 20 + + + + diff --git a/ios/RNNodeJsMobile.xcodeproj/project.pbxproj b/ios/RNNodeJsMobile.xcodeproj/project.pbxproj index 3d1d1dd..561347b 100644 --- a/ios/RNNodeJsMobile.xcodeproj/project.pbxproj +++ b/ios/RNNodeJsMobile.xcodeproj/project.pbxproj @@ -3,13 +3,13 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 52; objects = { /* Begin PBXBuildFile section */ - 339D56202017B27B003DFDA0 /* NodeMobile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 339D561F2017B27B003DFDA0 /* NodeMobile.framework */; }; 33AE3DEB1F7A9C150051C3C6 /* rn-bridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 33AE3DEA1F7A9C150051C3C6 /* rn-bridge.cpp */; settings = {COMPILER_FLAGS = "-I$(SRCROOT)/libnode/include/node/"; }; }; 33C4E1FF1F7979160047084D /* NodeRunner.mm in Sources */ = {isa = PBXBuildFile; fileRef = 33C4E1FE1F7979160047084D /* NodeRunner.mm */; }; + 5BCE3F872861F39A00A67BF4 /* NodeMobile.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5BCE3F862861F39A00A67BF4 /* NodeMobile.xcframework */; }; B3E7B58A1CC2AC0600A0062D /* RNNodeJsMobile.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* RNNodeJsMobile.m */; }; /* End PBXBuildFile section */ @@ -28,11 +28,11 @@ /* Begin PBXFileReference section */ 134814201AA4EA6300B7C361 /* libRNNodeJsMobile.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNNodeJsMobile.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 339D561F2017B27B003DFDA0 /* NodeMobile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = NodeMobile.framework; sourceTree = ""; }; 33AE3DE91F7A9C150051C3C6 /* rn-bridge.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "rn-bridge.h"; sourceTree = ""; }; 33AE3DEA1F7A9C150051C3C6 /* rn-bridge.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "rn-bridge.cpp"; sourceTree = ""; }; 33C4E1FD1F7978E90047084D /* NodeRunner.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = NodeRunner.hpp; sourceTree = ""; }; 33C4E1FE1F7979160047084D /* NodeRunner.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = NodeRunner.mm; sourceTree = ""; }; + 5BCE3F862861F39A00A67BF4 /* NodeMobile.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = NodeMobile.xcframework; path = ../../Documents/out_ios/NodeMobile.xcframework; sourceTree = ""; }; B3E7B5881CC2AC0600A0062D /* RNNodeJsMobile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNodeJsMobile.h; sourceTree = ""; }; B3E7B5891CC2AC0600A0062D /* RNNodeJsMobile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNodeJsMobile.m; sourceTree = ""; }; /* End PBXFileReference section */ @@ -42,7 +42,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 339D56202017B27B003DFDA0 /* NodeMobile.framework in Frameworks */, + 5BCE3F872861F39A00A67BF4 /* NodeMobile.xcframework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -60,7 +60,7 @@ 33C4E26E1F798D110047084D /* Frameworks */ = { isa = PBXGroup; children = ( - 339D561F2017B27B003DFDA0 /* NodeMobile.framework */, + 5BCE3F862861F39A00A67BF4 /* NodeMobile.xcframework */, ); name = Frameworks; sourceTree = ""; @@ -118,6 +118,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = 58B511D21A9E6C8500147676; @@ -181,6 +182,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -218,6 +220,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; diff --git a/nodejs-mobile-react-native.podspec b/nodejs-mobile-react-native.podspec index 33a34b0..c434304 100644 --- a/nodejs-mobile-react-native.podspec +++ b/nodejs-mobile-react-native.podspec @@ -18,7 +18,7 @@ Pod::Spec.new do |s| 'ENABLE_BITCODE' => 'NO' } s.user_target_xcconfig = { 'ENABLE_BITCODE' => 'NO' } - s.ios.vendored_frameworks = 'ios/NodeMobile.framework' + s.ios.vendored_frameworks = 'ios/NodeMobile.xcframework' s.static_framework = true s.dependency 'React-Core' end