diff --git a/Libraries/ART/React-ART.podspec b/Libraries/ART/React-ART.podspec index 6794975d1578ff..16050e2c2828b7 100644 --- a/Libraries/ART/React-ART.podspec +++ b/Libraries/ART/React-ART.podspec @@ -29,7 +29,6 @@ Pod::Spec.new do |s| s.source_files = "**/*.{m}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" s.header_dir = "ART" - s.static_framework = true s.dependency "React-Core/ARTHeaders", version end diff --git a/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec b/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec index 53eb10000be23d..de69c063e171e2 100644 --- a/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec +++ b/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec @@ -30,7 +30,6 @@ Pod::Spec.new do |s| s.source_files = "*.{m}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" s.header_dir = "RCTActionSheet" - s.static_framework = true s.dependency "React-Core/RCTActionSheetHeaders", version end diff --git a/Libraries/Blob/React-RCTBlob.podspec b/Libraries/Blob/React-RCTBlob.podspec index ab2f8d3472c369..225a23eb133164 100644 --- a/Libraries/Blob/React-RCTBlob.podspec +++ b/Libraries/Blob/React-RCTBlob.podspec @@ -30,10 +30,9 @@ Pod::Spec.new do |s| s.source_files = "*.{m,mm}", "RCTBlobCollector.h" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" s.header_dir = "RCTBlob" - s.static_framework = true s.dependency "React-Core/RCTBlobHeaders", version + s.dependency "React-Core/RCTWebSocket", version s.dependency "React-RCTNetwork", version - s.dependency "React-RCTWebSocket", version s.dependency "React-jsi", version end diff --git a/Libraries/CameraRoll/React-RCTCameraRoll.podspec b/Libraries/CameraRoll/React-RCTCameraRoll.podspec index a54f6728afc349..66e8682b3ffc1b 100644 --- a/Libraries/CameraRoll/React-RCTCameraRoll.podspec +++ b/Libraries/CameraRoll/React-RCTCameraRoll.podspec @@ -29,5 +29,4 @@ Pod::Spec.new do |s| s.source = source s.source_files = "**/*.{c,h,m,mm,cpp}" s.header_dir = "RCTRequired" - s.static_framework = true end diff --git a/Libraries/Image/React-RCTImage.podspec b/Libraries/Image/React-RCTImage.podspec index 1ea644b474691f..62bb32cfea9569 100644 --- a/Libraries/Image/React-RCTImage.podspec +++ b/Libraries/Image/React-RCTImage.podspec @@ -30,7 +30,6 @@ Pod::Spec.new do |s| s.source_files = "*.{m}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" s.header_dir = "RCTImage" - s.static_framework = true s.dependency "React-Core/RCTImageHeaders", version s.dependency "React-RCTNetwork", version diff --git a/Libraries/LinkingIOS/React-RCTLinking.podspec b/Libraries/LinkingIOS/React-RCTLinking.podspec index 4d396e2d64125f..7845c262f86ce1 100644 --- a/Libraries/LinkingIOS/React-RCTLinking.podspec +++ b/Libraries/LinkingIOS/React-RCTLinking.podspec @@ -30,7 +30,6 @@ Pod::Spec.new do |s| s.source_files = "*.{m}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" s.header_dir = "RCTLinking" - s.static_framework = true s.dependency "React-Core/RCTLinkingHeaders", version end diff --git a/Libraries/NativeAnimation/React-RCTAnimation.podspec b/Libraries/NativeAnimation/React-RCTAnimation.podspec index aa195398b3de93..95e6de03b329ca 100644 --- a/Libraries/NativeAnimation/React-RCTAnimation.podspec +++ b/Libraries/NativeAnimation/React-RCTAnimation.podspec @@ -29,7 +29,6 @@ Pod::Spec.new do |s| s.source_files = "{Drivers/*,Nodes/*,*}.{m}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" s.header_dir = "RCTAnimation" - s.static_framework = true s.dependency "React-Core/RCTAnimationHeaders", version end diff --git a/Libraries/Network/React-RCTNetwork.podspec b/Libraries/Network/React-RCTNetwork.podspec index ce9366626c4f83..3cf6fc514f49d6 100644 --- a/Libraries/Network/React-RCTNetwork.podspec +++ b/Libraries/Network/React-RCTNetwork.podspec @@ -29,7 +29,6 @@ Pod::Spec.new do |s| s.source_files = "*.{m,mm}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" s.header_dir = "RCTNetwork" - s.static_framework = true s.dependency "React-Core/RCTNetworkHeaders", version end diff --git a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec b/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec index 1c4fa37a479e01..a52a8799fb690d 100644 --- a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec +++ b/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec @@ -30,7 +30,6 @@ Pod::Spec.new do |s| s.source_files = "*.{m}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" s.header_dir = "RCTPushNotification" - s.static_framework = true s.dependency "React-Core/RCTPushNotificationHeaders", version end diff --git a/Libraries/Settings/React-RCTSettings.podspec b/Libraries/Settings/React-RCTSettings.podspec index f61c7e5871266c..fe3ae075b1302e 100644 --- a/Libraries/Settings/React-RCTSettings.podspec +++ b/Libraries/Settings/React-RCTSettings.podspec @@ -30,7 +30,6 @@ Pod::Spec.new do |s| s.source_files = "*.{m}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" s.header_dir = "RCTSettings" - s.static_framework = true s.dependency "React-Core/RCTSettingsHeaders", version end diff --git a/Libraries/Text/React-RCTText.podspec b/Libraries/Text/React-RCTText.podspec index 31e05163f883de..888538512ac1b3 100644 --- a/Libraries/Text/React-RCTText.podspec +++ b/Libraries/Text/React-RCTText.podspec @@ -30,7 +30,6 @@ Pod::Spec.new do |s| s.source_files = "**/*.{h,m}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" s.header_dir = "RCTText" - s.static_framework = true s.dependency "React-Core/RCTTextHeaders", version end diff --git a/Libraries/Vibration/React-RCTVibration.podspec b/Libraries/Vibration/React-RCTVibration.podspec index 04b6ffeb27f866..aa9959326fa9cc 100644 --- a/Libraries/Vibration/React-RCTVibration.podspec +++ b/Libraries/Vibration/React-RCTVibration.podspec @@ -30,7 +30,6 @@ Pod::Spec.new do |s| s.source_files = "*.{m}" s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" s.header_dir = "RCTVibration" - s.static_framework = true s.dependency "React-Core/RCTVibrationHeaders", version end diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock index 873054d4d3ca20..7ab20c74c46913 100644 --- a/RNTester/Podfile.lock +++ b/RNTester/Podfile.lock @@ -13,7 +13,8 @@ PODS: - glog (0.3.5) - React (1000.0.0): - React-Core (= 1000.0.0) - - React-DevSupport (= 1000.0.0) + - React-Core/DevSupport (= 1000.0.0) + - React-Core/RCTWebSocket (= 1000.0.0) - React-RCTActionSheet (= 1000.0.0) - React-RCTAnimation (= 1000.0.0) - React-RCTBlob (= 1000.0.0) @@ -23,7 +24,6 @@ PODS: - React-RCTSettings (= 1000.0.0) - React-RCTText (= 1000.0.0) - React-RCTVibration (= 1000.0.0) - - React-RCTWebSocket (= 1000.0.0) - React-ART (1000.0.0): - React-Core/ARTHeaders (= 1000.0.0) - React-Core (1000.0.0): @@ -57,13 +57,15 @@ PODS: - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - yoga (= 1000.0.0.React) - - React-Core/DevSupportHeaders (1000.0.0): + - React-Core/DevSupport (1000.0.0): - Folly (= 2018.10.22.00) - glog - - React-Core/Default + - React-Core/Default (= 1000.0.0) + - React-Core/RCTWebSocket (= 1000.0.0) - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) + - React-jsinspector (= 1000.0.0) - yoga (= 1000.0.0.React) - React-Core/RCTActionSheetHeaders (1000.0.0): - Folly (= 2018.10.22.00) @@ -145,10 +147,10 @@ PODS: - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - yoga (= 1000.0.0.React) - - React-Core/RCTWebSocketHeaders (1000.0.0): + - React-Core/RCTWebSocket (1000.0.0): - Folly (= 2018.10.22.00) - glog - - React-Core/Default + - React-Core/Default (= 1000.0.0) - React-cxxreact (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) @@ -157,6 +159,7 @@ PODS: - FBReactNativeSpec (= 1000.0.0) - Folly (= 2018.10.22.00) - React-Core/CoreModulesHeaders (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) - React-cxxreact (1000.0.0): - boost-for-react-native (= 1.63.0) - DoubleConversion @@ -192,6 +195,7 @@ PODS: - React-Core/RCTAnimationHeaders (= 1000.0.0) - React-RCTBlob (1000.0.0): - React-Core/RCTBlobHeaders (= 1000.0.0) + - React-Core/RCTWebSocket (= 1000.0.0) - React-jsi (= 1000.0.0) - React-RCTNetwork (= 1000.0.0) - React-RCTWebSocket (= 1000.0.0) @@ -215,8 +219,6 @@ PODS: - React-Core/RCTTextHeaders (= 1000.0.0) - React-RCTVibration (1000.0.0): - React-Core/RCTVibrationHeaders (= 1000.0.0) - - React-RCTWebSocket (1000.0.0): - - React-Core/RCTWebSocketHeaders (= 1000.0.0) - ReactCommon/jscallinvoker (1000.0.0): - DoubleConversion - Folly (= 2018.10.22.00) @@ -247,6 +249,8 @@ DEPENDENCIES: - React (from `../`) - React-ART (from `../Libraries/ART`) - React-Core (from `../`) + - React-Core/DevSupport (from `../`) + - React-Core/RCTWebSocket (from `../`) - React-CoreModules (from `../React/CoreModules`) - React-cxxreact (from `../ReactCommon/cxxreact`) - React-DevSupport (from `../React`) @@ -268,6 +272,9 @@ DEPENDENCIES: - React-RCTWebSocket (from `../Libraries/WebSocket`) - React-turbomodule-core (from `../ReactCommon/turbomodule/core`) - React-turbomodule-samples (from `../ReactCommon/turbomodule/samples`) + - ReactCommon/jscallinvoker (from `../ReactCommon`) + - ReactCommon/turbomodule/core (from `../ReactCommon`) + - ReactCommon/turbomodule/samples (from `../ReactCommon`) - yoga (from `../ReactCommon/yoga`) SPEC REPOS: @@ -329,6 +336,8 @@ EXTERNAL SOURCES: :path: "../ReactCommon/turbomodule/core" React-turbomodule-samples: :path: "../ReactCommon/turbomodule/samples" + ReactCommon: + :path: "../ReactCommon" yoga: :path: "../ReactCommon/yoga" @@ -336,33 +345,31 @@ SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 FBLazyVector: 34431b7e61740bed29b082ff81500b0ffafaffa0 - FBReactNativeSpec: 0c434153f44d4a1cbd111fbde1502580475e9132 + FBReactNativeSpec: e9febd2d5cc091662f172724165922b2e28d10a3 Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 glog: 1f3da668190260b06b429bb211bfbee5cd790c28 - RCTRequired: 770d733d8b6881e0ecd1085d0eb7f57dfacc5d93 - RCTTypeSafety: 8540a73bafd032be534cb683471f985dc656bfb6 - React: 7c652b87c228731c51ab5764de68b6c17e6342be - React-ART: 84555d2fcff922e3fed8ce70b5fb2536fb7c163e - React-Core: 266e5912bbfd0bddb866782b9bb560d82c5b8ef4 - React-CoreModules: 018c3d55a5bfbd04655489942a8c606527176eed - React-cxxreact: 8cbb09bfdf4241546c5f4a9f46d92f63295281e0 - React-DevSupport: f5349e286c067443895e6ae60d808eeaabedf472 - React-jsi: ec7bccfadb03c9aa26db7ba880a02b983b921316 - React-jsiexecutor: 173df46fcbafe60986cd5e42bde45e693c783af9 - React-jsinspector: 426757e28a6909b49f7dd126f6f1dbd2783764f8 - React-RCTActionSheet: a172ba63176ca80d7440f29fdd65515b442e4232 - React-RCTAnimation: 276dde8150bb1a7d9eef8f3b44db66bddebedec3 - React-RCTBlob: d60bf36ef77d3fb9e39a46443ea89c68381b4650 - React-RCTImage: 29cbf7ccc2b89ac7ac6d9f2c84c15cfabaeabe6b - React-RCTLinking: 387d21f8fd4423dde220bf18be9715054cfc7cf5 - React-RCTNetwork: ad750ce9bd98d382020174b14537d2ffa09427e0 - React-RCTPushNotification: 90e1127e8f243296eef48c35dba370588405728b - React-RCTSettings: 405b277fb5afed794564af2d99ab71315806768d - React-RCTTest: c999df66263f36ddd63328356ac5898f2089e91e - React-RCTText: 667603cc6464856a6314a05b3d605da0a7fbf8e3 - React-RCTVibration: 775cffcf1040bfa92fea6982f43d5f1a438edf05 - React-RCTWebSocket: c10d7eecfc66d58ece635508dc1e8ecf6b548c60 - ReactCommon: 7fd06e02cb448d0260cb7219cf0057984b49de17 + RCTRequired: 33f3b89d2d82ef01c02b9b4f8146c43762e509d8 + RCTTypeSafety: 2b1cb2d92b779aa9a3522f67bd4f07e6b6d0797e + React: 28a654b69575941571c073a656bc06795825e7f7 + React-ART: a5da06a892342d03896e0db45a7072525981f63c + React-Core: 47b8ab211d9325292811e62ee23c54b464853111 + React-CoreModules: 38d8cc34497674ae3d411e644a9b17ad75ef3f74 + React-cxxreact: 7c4242192149ce0205b53efaa03e3bf86ba4337c + React-jsi: 98d1f9d8a79d2720ba6a44c2d928a77f315b7e4f + React-jsiexecutor: c0ab8c80a6e88380d63f583690a50d4a723b47b5 + React-jsinspector: ea0a218071a11c3687cef2480580180caa6a64c0 + React-RCTActionSheet: 090e7bd7c5774d919c47c4eeff78223a7fd8c19c + React-RCTAnimation: 73d536fff417a101724d9529189c95a94263710c + React-RCTBlob: 86017e0ba937b94445c5f680fef27ab831700fe7 + React-RCTImage: 7f5c9bff34905f1bc216be512ba0ae68f872208a + React-RCTLinking: d7d7f792e63a8d57380cecbb9b7a3b31f92d1bb6 + React-RCTNetwork: c8f9d40297f35ea3792ea81866f33e8b45c25935 + React-RCTPushNotification: acffa8af6a20e6d41b041a8c4cb4bea0de9df0dd + React-RCTSettings: dd4009546ce88c3647c32f0b5922459ab313fdca + React-RCTTest: 73df09ec226fcad6e7e058a313e5dd16cccf86a8 + React-RCTText: 9078167d3bc011162326f2d8ef4dd580ec1eca17 + React-RCTVibration: 63c20d89204937ff8c7bbc1e712383347e6fbd90 + ReactCommon: 63d1a6355d5810a21a61efda9ac93804571a1b8b yoga: b72aa5b3708cc93c5897f8297122d6eba1331e07 PODFILE CHECKSUM: bb578b8286c0068879a41ac092c9690cc3ede523 diff --git a/RNTester/RCTTest/React-RCTTest.podspec b/RNTester/RCTTest/React-RCTTest.podspec index 2afb7c2099711d..0ee3195ce00e73 100644 --- a/RNTester/RCTTest/React-RCTTest.podspec +++ b/RNTester/RCTTest/React-RCTTest.podspec @@ -30,7 +30,6 @@ Pod::Spec.new do |s| s.preserve_paths = "package.json", "LICENSE", "LICENSE-docs" s.framework = "XCTest" s.header_dir = "RCTTest" - s.static_framework = true - + s.dependency "React-Core", version end diff --git a/RNTester/RNTesterPods.xcodeproj/project.pbxproj b/RNTester/RNTesterPods.xcodeproj/project.pbxproj index d1eca6f7f32af8..66b5c02f97f4c0 100644 --- a/RNTester/RNTesterPods.xcodeproj/project.pbxproj +++ b/RNTester/RNTesterPods.xcodeproj/project.pbxproj @@ -136,7 +136,6 @@ E7DB20F822B2BD53005AC45F /* libReact-ART.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-ART.a"; sourceTree = BUILT_PRODUCTS_DIR; }; E7DB20FA22B2BD53005AC45F /* libReact-Core.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-Core.a"; sourceTree = BUILT_PRODUCTS_DIR; }; E7DB20FC22B2BD53005AC45F /* libReact-cxxreact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-cxxreact.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - E7DB20FE22B2BD53005AC45F /* libReact-DevSupport.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-DevSupport.a"; sourceTree = BUILT_PRODUCTS_DIR; }; E7DB210222B2BD53005AC45F /* libReact-jsi.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-jsi.a"; sourceTree = BUILT_PRODUCTS_DIR; }; E7DB210422B2BD53005AC45F /* libReact-jsiexecutor.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-jsiexecutor.a"; sourceTree = BUILT_PRODUCTS_DIR; }; E7DB210622B2BD53005AC45F /* libReact-jsinspector.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-jsinspector.a"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -150,7 +149,6 @@ E7DB211622B2BD53005AC45F /* libReact-RCTSettings.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-RCTSettings.a"; sourceTree = BUILT_PRODUCTS_DIR; }; E7DB211822B2BD53005AC45F /* libReact-RCTText.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-RCTText.a"; sourceTree = BUILT_PRODUCTS_DIR; }; E7DB211A22B2BD53005AC45F /* libReact-RCTVibration.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-RCTVibration.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - E7DB211C22B2BD53005AC45F /* libReact-RCTWebSocket.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-RCTWebSocket.a"; sourceTree = BUILT_PRODUCTS_DIR; }; E7DB212222B2BD53005AC45F /* libyoga.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libyoga.a; sourceTree = BUILT_PRODUCTS_DIR; }; E7DB212422B2C342005AC45F /* libOCMock.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libOCMock.a; sourceTree = ""; }; E7DB212622B2C342005AC45F /* OCMockObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OCMockObject.h; sourceTree = ""; }; @@ -255,7 +253,6 @@ E7DB20F822B2BD53005AC45F /* libReact-ART.a */, E7DB20FA22B2BD53005AC45F /* libReact-Core.a */, E7DB20FC22B2BD53005AC45F /* libReact-cxxreact.a */, - E7DB20FE22B2BD53005AC45F /* libReact-DevSupport.a */, E7DB210222B2BD53005AC45F /* libReact-jsi.a */, E7DB210422B2BD53005AC45F /* libReact-jsiexecutor.a */, E7DB210622B2BD53005AC45F /* libReact-jsinspector.a */, @@ -269,7 +266,6 @@ E7DB211622B2BD53005AC45F /* libReact-RCTSettings.a */, E7DB211822B2BD53005AC45F /* libReact-RCTText.a */, E7DB211A22B2BD53005AC45F /* libReact-RCTVibration.a */, - E7DB211C22B2BD53005AC45F /* libReact-RCTWebSocket.a */, E7DB212222B2BD53005AC45F /* libyoga.a */, F94084777080D7B374FB4783 /* libPods-RNTester.a */, 8210317F3CE28B1945488740 /* libPods-RNTesterIntegrationTests.a */, @@ -537,7 +533,6 @@ "\"${PODS_ROOT}/Headers/Public/DoubleConversion\"", "\"${PODS_ROOT}/Headers/Public/React-ART\"", "\"${PODS_ROOT}/Headers/Public/React-Core\"", - "\"${PODS_ROOT}/Headers/Public/React-DevSupport\"", "\"${PODS_ROOT}/Headers/Public/React-Fabric\"", "\"${PODS_ROOT}/Headers/Public/React-RCTActionSheet\"", "\"${PODS_ROOT}/Headers/Public/React-RCTAnimation\"", @@ -552,7 +547,6 @@ "\"${PODS_ROOT}/Headers/Public/React-RCTSettings\"", "\"${PODS_ROOT}/Headers/Public/React-RCTText\"", "\"${PODS_ROOT}/Headers/Public/React-RCTVibration\"", - "\"${PODS_ROOT}/Headers/Public/React-RCTWebSocket\"", "\"${PODS_ROOT}/Headers/Public/React-cxxreact\"", "\"${PODS_ROOT}/Headers/Public/React-fishhook\"", "\"${PODS_ROOT}/Headers/Public/React-jsi\"", @@ -594,7 +588,6 @@ "\"${PODS_ROOT}/Headers/Public/DoubleConversion\"", "\"${PODS_ROOT}/Headers/Public/React-ART\"", "\"${PODS_ROOT}/Headers/Public/React-Core\"", - "\"${PODS_ROOT}/Headers/Public/React-DevSupport\"", "\"${PODS_ROOT}/Headers/Public/React-Fabric\"", "\"${PODS_ROOT}/Headers/Public/React-RCTActionSheet\"", "\"${PODS_ROOT}/Headers/Public/React-RCTAnimation\"", @@ -609,7 +602,6 @@ "\"${PODS_ROOT}/Headers/Public/React-RCTSettings\"", "\"${PODS_ROOT}/Headers/Public/React-RCTText\"", "\"${PODS_ROOT}/Headers/Public/React-RCTVibration\"", - "\"${PODS_ROOT}/Headers/Public/React-RCTWebSocket\"", "\"${PODS_ROOT}/Headers/Public/React-cxxreact\"", "\"${PODS_ROOT}/Headers/Public/React-fishhook\"", "\"${PODS_ROOT}/Headers/Public/React-jsi\"", diff --git a/React-Core.podspec b/React-Core.podspec index 04e49efb978618..77f430a032f44f 100644 --- a/React-Core.podspec +++ b/React-Core.podspec @@ -23,7 +23,6 @@ boost_compiler_flags = '-Wno-documentation' header_subspecs = { 'ARTHeaders' => 'Libraries/ART/**/*.h', - 'DevSupportHeaders' => 'React/{DevSupport/*.h,Inspector/*.h}', 'CoreModulesHeaders' => 'React/CoreModules/**/*.h', 'RCTActionSheetHeaders' => 'Libraries/ActionSheetIOS/*.h', 'RCTAnimationHeaders' => 'Libraries/NativeAnimation/{Drivers/*,Nodes/*,*}.{h}', @@ -34,9 +33,7 @@ header_subspecs = { 'RCTPushNotificationHeaders' => 'Libraries/PushNotificationIOS/*.h', 'RCTSettingsHeaders' => 'Libraries/Settings/*.h', 'RCTTextHeaders' => 'Libraries/Text/**/*.h', - 'RCTSettingsHeaders' => 'Libraries/Settings/*.h', 'RCTVibrationHeaders' => 'Libraries/Vibration/*.h', - 'RCTWebSocketHeaders' => 'Libraries/WebSocket/*.h', } Pod::Spec.new do |s| @@ -50,12 +47,11 @@ Pod::Spec.new do |s| s.source = source s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags s.header_dir = "React" - s.static_framework = true s.framework = "JavaScriptCore" s.library = "stdc++" s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Folly\"" } s.user_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/React-Core\""} - s.default_subspec = "Default" + s.default_subspec = "Default" s.subspec "Default" do |ss| ss.source_files = "React/**/*.{c,h,m,mm,S,cpp}" @@ -73,6 +69,20 @@ Pod::Spec.new do |s| ss.private_header_files = "React/Cxx*/*.h" end + s.subspec "DevSupport" do |ss| + ss.source_files = "React/DevSupport/*.{h,mm,m}", + "React/Inspector/*.{h,mm,m}" + + ss.dependency "React-Core/Default", version + ss.dependency "React-Core/RCTWebSocket", version + ss.dependency "React-jsinspector", version + end + + s.subspec "RCTWebSocket" do |ss| + ss.source_files = "Libraries/WebSocket/*.{h,m}" + ss.dependency "React-Core/Default", version + end + # Add a subspec containing just the headers for each # pod that should live under header_subspecs.each do |name, headers| diff --git a/React.podspec b/React.podspec index 935b00d2ffba5d..50298c2ee40d91 100644 --- a/React.podspec +++ b/React.podspec @@ -43,7 +43,8 @@ Pod::Spec.new do |s| s.cocoapods_version = ">= 1.2.0" s.dependency "React-Core", version - s.dependency "React-DevSupport", version + s.dependency "React-Core/DevSupport", version + s.dependency "React-Core/RCTWebSocket", version s.dependency "React-RCTActionSheet", version s.dependency "React-RCTAnimation", version s.dependency "React-RCTBlob", version @@ -53,5 +54,4 @@ Pod::Spec.new do |s| s.dependency "React-RCTSettings", version s.dependency "React-RCTText", version s.dependency "React-RCTVibration", version - s.dependency "React-RCTWebSocket", version end diff --git a/React/React-DevSupport.podspec b/React/React-DevSupport.podspec deleted file mode 100644 index f247f83dc0574e..00000000000000 --- a/React/React-DevSupport.podspec +++ /dev/null @@ -1,37 +0,0 @@ -# coding: utf-8 -# Copyright (c) Facebook, Inc. and its affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -require "json" - -package = JSON.parse(File.read(File.join(__dir__, "..", "package.json"))) -version = package['version'] - -source = { :git => 'https://github.com/facebook/react-native.git' } -if version == '1000.0.0' - # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in. - source[:commit] = `git rev-parse HEAD`.strip -else - source[:tag] = "v#{version}" -end - -Pod::Spec.new do |s| - s.name = "React-DevSupport" - s.version = version - s.summary = "-" # TODO - s.homepage = "http://facebook.github.io/react-native/" - s.license = package["license"] - s.author = "Facebook, Inc. and its affiliates" - s.platforms = { :ios => "9.0", :tvos => "9.2" } - s.source = source - s.source_files = "DevSupport/*.{mm,m}", - "Inspector/*.{mm,m}" - s.header_dir = "DevSupport" - s.static_framework = true - - s.dependency "React-Core/DevSupportHeaders", version - s.dependency "React-RCTWebSocket", version - s.dependency "React-jsinspector", version -end diff --git a/React/React-RCTFabric.podspec b/React/React-RCTFabric.podspec index 9ccc6dc824336c..0a04a5d494c43f 100644 --- a/React/React-RCTFabric.podspec +++ b/React/React-RCTFabric.podspec @@ -36,7 +36,6 @@ Pod::Spec.new do |s| "**/android/*", s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags s.header_dir = "React" - s.static_framework = true s.framework = "JavaScriptCore" s.library = "stdc++" s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/Headers/Private/React-Core\"" } diff --git a/ReactCommon/React-Fabric.podspec b/ReactCommon/React-Fabric.podspec index 7399b81e3019e3..9fe685f5701775 100644 --- a/ReactCommon/React-Fabric.podspec +++ b/ReactCommon/React-Fabric.podspec @@ -36,7 +36,6 @@ Pod::Spec.new do |s| s.library = "stdc++" s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++14" } - s.static_framework = true s.dependency folly_dep_name, folly_version s.dependency "React-graphics", version diff --git a/ReactCommon/ReactCommon.podspec b/ReactCommon/ReactCommon.podspec index e928e3ef1490dd..38e6e5571d67a6 100644 --- a/ReactCommon/ReactCommon.podspec +++ b/ReactCommon/ReactCommon.podspec @@ -32,7 +32,6 @@ Pod::Spec.new do |s| s.platforms = { :ios => "9.0", :tvos => "9.2" } s.source = source s.header_dir = "ReactCommon" # Use global header_dir for all subspecs for use_framework compatibility - s.static_framework = true s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\"", "USE_HEADERMAP" => "YES", diff --git a/ReactCommon/cxxreact/React-cxxreact.podspec b/ReactCommon/cxxreact/React-cxxreact.podspec index e9a4c96e668edf..3f1a214f0d20eb 100644 --- a/ReactCommon/cxxreact/React-cxxreact.podspec +++ b/ReactCommon/cxxreact/React-cxxreact.podspec @@ -35,7 +35,6 @@ Pod::Spec.new do |s| s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" } s.header_dir = "cxxreact" - s.static_framework = true s.dependency "boost-for-react-native", "1.63.0" s.dependency "DoubleConversion" diff --git a/ReactCommon/fabric/graphics/React-graphics.podspec b/ReactCommon/fabric/graphics/React-graphics.podspec index 0233e6eceac327..539e65f676c9aa 100644 --- a/ReactCommon/fabric/graphics/React-graphics.podspec +++ b/ReactCommon/fabric/graphics/React-graphics.podspec @@ -35,7 +35,6 @@ Pod::Spec.new do |s| s.exclude_files = "**/tests/*", "**/android/*" s.header_dir = "react/graphics" - s.static_framework = true s.pod_target_xcconfig = { "USE_HEADERMAP" => "NO", "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/Folly\"" } s.dependency "Folly/Fabric", folly_version diff --git a/ReactCommon/jscallinvoker/React-jscallinvoker.podspec b/ReactCommon/jscallinvoker/React-jscallinvoker.podspec index e2d91d825caa88..13bbbd148f742e 100644 --- a/ReactCommon/jscallinvoker/React-jscallinvoker.podspec +++ b/ReactCommon/jscallinvoker/React-jscallinvoker.podspec @@ -33,7 +33,6 @@ Pod::Spec.new do |s| s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags s.source_files = "**/*.{c,m,mm,cpp}" s.header_dir = "CoreModules" - s.static_framework = true s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", @@ -43,4 +42,5 @@ Pod::Spec.new do |s| s.dependency "React-cxxreact", version s.dependency "Folly", folly_version s.dependency "React-Core/CoreModulesHeaders", version + s.dependency "ReactCommon/turbomodule/core", version end diff --git a/ReactCommon/jsi/React-jsi.podspec b/ReactCommon/jsi/React-jsi.podspec index 3dcf85b7730e34..1843167dab6e9b 100644 --- a/ReactCommon/jsi/React-jsi.podspec +++ b/ReactCommon/jsi/React-jsi.podspec @@ -35,7 +35,6 @@ Pod::Spec.new do |s| s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" } s.header_dir = "jsi" - s.static_framework = true s.default_subspec = "Default" s.dependency "boost-for-react-native", "1.63.0" diff --git a/ReactCommon/jsiexecutor/React-jsiexecutor.podspec b/ReactCommon/jsiexecutor/React-jsiexecutor.podspec index 3be23e8535cf0b..6ee7e3c9067643 100644 --- a/ReactCommon/jsiexecutor/React-jsiexecutor.podspec +++ b/ReactCommon/jsiexecutor/React-jsiexecutor.podspec @@ -34,7 +34,6 @@ Pod::Spec.new do |s| s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" } s.header_dir = "jsireact" - s.static_framework = true s.dependency "React-cxxreact", version s.dependency "React-jsi", version diff --git a/ReactCommon/jsinspector/React-jsinspector.podspec b/ReactCommon/jsinspector/React-jsinspector.podspec index 00dbe2f3c1598a..63db57a4900717 100644 --- a/ReactCommon/jsinspector/React-jsinspector.podspec +++ b/ReactCommon/jsinspector/React-jsinspector.podspec @@ -28,5 +28,4 @@ Pod::Spec.new do |s| s.source = source s.source_files = "*.{cpp,h}" s.header_dir = 'jsinspector' - s.static_framework = true end diff --git a/ReactCommon/turbomodule/core/React-turbomodule-core.podspec b/ReactCommon/turbomodule/core/React-turbomodule-core.podspec index f24701c3f2ccea..eec714282e9c77 100644 --- a/ReactCommon/turbomodule/core/React-turbomodule-core.podspec +++ b/ReactCommon/turbomodule/core/React-turbomodule-core.podspec @@ -32,7 +32,6 @@ Pod::Spec.new do |s| s.source = source s.source_files = "**/*.{c,h,m,mm,cpp}" s.header_dir = "RCTTypeSafety" - s.static_framework = true s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES", "CLANG_CXX_LANGUAGE_STANDARD" => "c++14", diff --git a/ReactCommon/turbomodule/samples/React-turbomodule-samples.podspec b/ReactCommon/turbomodule/samples/React-turbomodule-samples.podspec index dfcaeb4b208c6b..86cb637b8cac6a 100644 --- a/ReactCommon/turbomodule/samples/React-turbomodule-samples.podspec +++ b/ReactCommon/turbomodule/samples/React-turbomodule-samples.podspec @@ -32,7 +32,6 @@ Pod::Spec.new do |s| s.source = source s.source_files = "**/*.{c,h,m,mm,cpp}" s.header_dir = "FBReactNativeSpec" - s.static_framework = true s.dependency "React-Core", version s.dependency "React-cxxreact", version diff --git a/scripts/autolink-ios.rb b/scripts/autolink-ios.rb index 4b92c7928f0370..92b685df69f42c 100644 --- a/scripts/autolink-ios.rb +++ b/scripts/autolink-ios.rb @@ -26,10 +26,10 @@ def use_react_native! (options={}) pod 'React-RCTSettings', :path => "#{prefix}/Libraries/Settings" pod 'React-RCTText', :path => "#{prefix}/Libraries/Text" pod 'React-RCTVibration', :path => "#{prefix}/Libraries/Vibration" - pod 'React-RCTWebSocket', :path => "#{prefix}/Libraries/WebSocket" + pod 'React-Core/RCTWebSocket', :path => "#{prefix}/" unless production - pod 'React-DevSupport', :path => "#{prefix}/React" + pod 'React-Core/DevSupport', :path => "#{prefix}/" end pod 'React-cxxreact', :path => "#{prefix}/ReactCommon/cxxreact" diff --git a/template/ios/Podfile b/template/ios/Podfile index fcbc454baade29..46bd8ed25f3877 100644 --- a/template/ios/Podfile +++ b/template/ios/Podfile @@ -8,6 +8,7 @@ target 'HelloWorld' do pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules' pod 'React-DevSupport', :path => '../node_modules/react-native/React' pod 'React-fishhook', :path => '../node_modules/react-native/Libraries/fishhook' + pod 'React-Core/DevSupport', :path => '../node_modules/react-native/' pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS' pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation' pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob' @@ -17,7 +18,7 @@ target 'HelloWorld' do pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings' pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text' pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration' - pod 'React-RCTWebSocket', :path => '../node_modules/react-native/Libraries/WebSocket' + pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/' pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact' pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'