diff --git a/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec b/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec index fac55a923b6..9bff79423ad 100644 --- a/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec +++ b/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec @@ -43,5 +43,5 @@ Pod::Spec.new do |s| s.dependency "RCTRequired", version s.dependency "RCTTypeSafety", version s.dependency "React-Core", version - s.dependency "React-turbomodule-core", version + s.dependency "ReactCommon/turbomodule/core", version end diff --git a/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h b/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h index 3eccee93c48..2b488e37db6 100644 --- a/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h +++ b/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h @@ -21,8 +21,8 @@ #import #import #import +#import #import -#import #import diff --git a/RNTester/Podfile b/RNTester/Podfile index 0d0a9386b1d..3b45e9afeae 100644 --- a/RNTester/Podfile +++ b/RNTester/Podfile @@ -10,7 +10,7 @@ def pods() # Enable TurboModule use_react_native!(path: "..") - pod 'React-turbomodule-samples', :path => '../ReactCommon/turbomodule/samples' + pod 'ReactCommon/turbomodule/samples', :path => '../ReactCommon' # Additional Pods which aren't included in the default Podfile pod 'React-ART', :path => '../Libraries/ART' diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock index e1667904c87..06be840d4d3 100644 --- a/RNTester/Podfile.lock +++ b/RNTester/Podfile.lock @@ -7,7 +7,7 @@ PODS: - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - React-Core (= 1000.0.0) - - React-turbomodule-core (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) - Folly (2018.10.22.00): - boost-for-react-native - DoubleConversion @@ -122,34 +122,23 @@ PODS: - React-Core (= 1000.0.0) - React-RCTWebSocket (1000.0.0): - React-Core (= 1000.0.0) - - React-turbomodule-core (1000.0.0): + - ReactCommon/turbomodule/core (1000.0.0): + - DoubleConversion - Folly (= 2018.10.22.00) + - glog - React-Core/CxxBridge (= 1000.0.0) - React-cxxreact (= 1000.0.0) - React-jscallinvoker (= 1000.0.0) - React-jsi (= 1000.0.0) - - React-turbomodule-core/core-ios (= 1000.0.0) - - React-turbomodule-core/core-ios (1000.0.0): + - ReactCommon/turbomodule/samples (1000.0.0): + - DoubleConversion - Folly (= 2018.10.22.00) + - glog - React-Core/CxxBridge (= 1000.0.0) - React-cxxreact (= 1000.0.0) - React-jscallinvoker (= 1000.0.0) - React-jsi (= 1000.0.0) - - React-turbomodule-samples (1000.0.0): - - DoubleConversion - - Folly (= 2018.10.22.00) - - React-Core (= 1000.0.0) - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-turbomodule-core (= 1000.0.0) - - React-turbomodule-samples/samples-ios (= 1000.0.0) - - React-turbomodule-samples/samples-ios (1000.0.0): - - DoubleConversion - - Folly (= 2018.10.22.00) - - React-Core (= 1000.0.0) - - React-cxxreact (= 1000.0.0) - - React-jsi (= 1000.0.0) - - React-turbomodule-core (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) - yoga (1000.0.0.React) DEPENDENCIES: @@ -182,8 +171,8 @@ DEPENDENCIES: - React-RCTText (from `../Libraries/Text`) - React-RCTVibration (from `../Libraries/Vibration`) - React-RCTWebSocket (from `../Libraries/WebSocket`) - - React-turbomodule-core (from `../ReactCommon/turbomodule/core`) - - React-turbomodule-samples (from `../ReactCommon/turbomodule/samples`) + - ReactCommon/turbomodule/core (from `../ReactCommon`) + - ReactCommon/turbomodule/samples (from `../ReactCommon`) - yoga (from `../ReactCommon/yoga`) SPEC REPOS: @@ -249,10 +238,8 @@ EXTERNAL SOURCES: :path: "../Libraries/Vibration" React-RCTWebSocket: :path: "../Libraries/WebSocket" - React-turbomodule-core: - :path: "../ReactCommon/turbomodule/core" - React-turbomodule-samples: - :path: "../ReactCommon/turbomodule/samples" + ReactCommon: + :path: "../ReactCommon" yoga: :path: "../ReactCommon/yoga" @@ -260,7 +247,7 @@ SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 FBLazyVector: 34431b7e61740bed29b082ff81500b0ffafaffa0 - FBReactNativeSpec: 60bf4c6b7cd868b2878f2d3556e37ecfd5e51a17 + FBReactNativeSpec: 0b697c23db60351a2ae629e110581cdefbe5e939 Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 glog: 1f3da668190260b06b429bb211bfbee5cd790c28 RCTRequired: 33f3b89d2d82ef01c02b9b4f8146c43762e509d8 @@ -287,10 +274,9 @@ SPEC CHECKSUMS: React-RCTText: 469ec754592c92fc639825e558908c2f0e783e2c React-RCTVibration: ade3c169b54f3bc16c9a9918e17e48ef66aee6ba React-RCTWebSocket: cb5317e9a4adc37191660f819fb21d63433584ef - React-turbomodule-core: 5cce62fb65bd0b19f249bc1c4c54b82b3cf9a749 - React-turbomodule-samples: ef5c144b510530cb108d4bdb8615dc3943a802fd + ReactCommon: 85e9a652d56873ab4e91820ecd759ca006dc1b56 yoga: b72aa5b3708cc93c5897f8297122d6eba1331e07 -PODFILE CHECKSUM: 5ebd7e7531d9b6db21435251001600722f432414 +PODFILE CHECKSUM: f866eab42001b1d59349bce6b20d00912cdc700c COCOAPODS: 1.7.1 diff --git a/RNTester/RNTester/AppDelegate.mm b/RNTester/RNTester/AppDelegate.mm index 120a9415c1c..593b3802263 100644 --- a/RNTester/RNTester/AppDelegate.mm +++ b/RNTester/RNTester/AppDelegate.mm @@ -28,7 +28,7 @@ #endif #ifdef RN_TURBO_MODULE_ENABLED -#import +#import #import "RNTesterTurboModuleProvider.h" #endif diff --git a/RNTester/RNTester/RNTesterTurboModuleProvider.h b/RNTester/RNTester/RNTesterTurboModuleProvider.h index 6a6a0ab3bc2..11450e16781 100644 --- a/RNTester/RNTester/RNTesterTurboModuleProvider.h +++ b/RNTester/RNTester/RNTesterTurboModuleProvider.h @@ -8,7 +8,7 @@ #ifdef RN_TURBO_MODULE_ENABLED -#import +#import namespace facebook { namespace react { diff --git a/RNTester/RNTester/RNTesterTurboModuleProvider.mm b/RNTester/RNTester/RNTesterTurboModuleProvider.mm index 3870265b048..31e7e3e0655 100644 --- a/RNTester/RNTester/RNTesterTurboModuleProvider.mm +++ b/RNTester/RNTester/RNTesterTurboModuleProvider.mm @@ -11,8 +11,8 @@ #import "RNTesterTurboModuleProvider.h" #import -#import -#import +#import +#import // NOTE: This entire file should be codegen'ed. diff --git a/RNTester/RNTesterPods.xcodeproj/project.pbxproj b/RNTester/RNTesterPods.xcodeproj/project.pbxproj index 25e44b95c09..691488d894e 100644 --- a/RNTester/RNTesterPods.xcodeproj/project.pbxproj +++ b/RNTester/RNTesterPods.xcodeproj/project.pbxproj @@ -149,8 +149,6 @@ 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; }; - E7DB211E22B2BD53005AC45F /* libReact-turbomodule-core.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-turbomodule-core.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - E7DB212022B2BD53005AC45F /* libReact-turbomodule-samples.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = "libReact-turbomodule-samples.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 = ""; }; @@ -272,8 +270,6 @@ E7DB211822B2BD53005AC45F /* libReact-RCTText.a */, E7DB211A22B2BD53005AC45F /* libReact-RCTVibration.a */, E7DB211C22B2BD53005AC45F /* libReact-RCTWebSocket.a */, - E7DB211E22B2BD53005AC45F /* libReact-turbomodule-core.a */, - E7DB212022B2BD53005AC45F /* libReact-turbomodule-samples.a */, E7DB212222B2BD53005AC45F /* libyoga.a */, 8508AD3C1DC3509924E63948 /* libPods-RNTester.a */, 5DC8BF45A723792FE216DDD4 /* libPods-RNTesterIntegrationTests.a */, @@ -768,8 +764,6 @@ "-l\"React-jsi\"", "-l\"React-jsiexecutor\"", "-l\"React-jsinspector\"", - "-l\"React-turbomodule-core\"", - "-l\"React-turbomodule-samples\"", "-l\"glog\"", "-l\"stdc++\"", "-l\"yoga\"", @@ -848,8 +842,6 @@ "-l\"React-jsi\"", "-l\"React-jsiexecutor\"", "-l\"React-jsinspector\"", - "-l\"React-turbomodule-core\"", - "-l\"React-turbomodule-samples\"", "-l\"glog\"", "-l\"stdc++\"", "-l\"yoga\"", diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk index ea4e89c91e7..bb23db1b27a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk @@ -8,7 +8,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) # Header search path for all source files in this module. -LOCAL_C_INCLUDES := $(LOCAL_PATH)/jsireact +LOCAL_C_INCLUDES := $(LOCAL_PATH)/ReactCommon # Header search path for modules that depend on this module LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) @@ -22,8 +22,8 @@ LOCAL_SHARED_LIBRARIES = libfb # Name of this module. LOCAL_MODULE := jscallinvokerholder -# Compile all local c++ files under ./platform/android/jsireact -LOCAL_SRC_FILES := $(LOCAL_PATH)/jsireact/JSCallInvokerHolder.cpp +# Compile all local c++ files +LOCAL_SRC_FILES := $(LOCAL_PATH)/ReactCommon/JSCallInvokerHolder.cpp # Build the files in this directory as a shared library include $(BUILD_STATIC_LIBRARY) diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK index cf7f36a1c06..b7d464ee5be 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK @@ -3,13 +3,13 @@ load("@fbsource//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "FBJNI_TARGET", " rn_xplat_cxx_library( name = "jni", srcs = [ - "jsireact/OnLoad.cpp", - "jsireact/TurboModuleManager.cpp", + "ReactCommon/OnLoad.cpp", + "ReactCommon/TurboModuleManager.cpp", ], header_namespace = "", exported_headers = { - "jsireact/TurboModuleManager.h": "jsireact/TurboModuleManager.h", - "jsireact/TurboModuleManagerDelegate.h": "jsireact/TurboModuleManagerDelegate.h", + "ReactCommon/TurboModuleManager.h": "ReactCommon/TurboModuleManager.h", + "ReactCommon/TurboModuleManagerDelegate.h": "ReactCommon/TurboModuleManagerDelegate.h", }, compiler_flags = [ "-fexceptions", @@ -40,11 +40,11 @@ rn_xplat_cxx_library( rn_xplat_cxx_library( name = "jscallinvokerholder", srcs = [ - "jsireact/JSCallInvokerHolder.cpp", + "ReactCommon/JSCallInvokerHolder.cpp", ], header_namespace = "", exported_headers = { - "jsireact/JSCallInvokerHolder.h": "jsireact/JSCallInvokerHolder.h", + "ReactCommon/JSCallInvokerHolder.h": "ReactCommon/JSCallInvokerHolder.h", }, compiler_flags = [ "-fexceptions", diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/jsireact/JSCallInvokerHolder.cpp b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/JSCallInvokerHolder.cpp similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/jsireact/JSCallInvokerHolder.cpp rename to ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/JSCallInvokerHolder.cpp diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/jsireact/JSCallInvokerHolder.h b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/JSCallInvokerHolder.h similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/jsireact/JSCallInvokerHolder.h rename to ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/JSCallInvokerHolder.h diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/jsireact/OnLoad.cpp b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/OnLoad.cpp similarity index 100% rename from ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/jsireact/OnLoad.cpp rename to ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/OnLoad.cpp diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/jsireact/TurboModuleManager.cpp b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp similarity index 97% rename from ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/jsireact/TurboModuleManager.cpp rename to ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp index 0a7854f93ab..df3b0689026 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/jsireact/TurboModuleManager.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.cpp @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include #include #include "TurboModuleManager.h" diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/jsireact/TurboModuleManager.h b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.h similarity index 90% rename from ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/jsireact/TurboModuleManager.h rename to ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.h index fbb29834e0c..ce2e2345baa 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/jsireact/TurboModuleManager.h +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManager.h @@ -10,12 +10,12 @@ #include #include #include -#include -#include +#include +#include #include #include -#include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/jsireact/TurboModuleManagerDelegate.h b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManagerDelegate.h similarity index 95% rename from ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/jsireact/TurboModuleManagerDelegate.h rename to ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManagerDelegate.h index fbd46908287..c8121a1f443 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/jsireact/TurboModuleManagerDelegate.h +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/TurboModuleManagerDelegate.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp index 28de85f7ba2..3782296ea28 100644 --- a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp +++ b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "CxxModuleWrapper.h" #include "JavaScriptExecutorHolder.h" diff --git a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h index 0ea967de16c..beb67067f0d 100644 --- a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h +++ b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include "CxxModuleWrapper.h" diff --git a/ReactCommon/turbomodule/core/React-turbomodule-core.podspec b/ReactCommon/ReactCommon.podspec similarity index 53% rename from ReactCommon/turbomodule/core/React-turbomodule-core.podspec rename to ReactCommon/ReactCommon.podspec index e83f57d69f9..9737e311e39 100644 --- a/ReactCommon/turbomodule/core/React-turbomodule-core.podspec +++ b/ReactCommon/ReactCommon.podspec @@ -6,7 +6,7 @@ require "json" -package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "package.json"))) +package = JSON.parse(File.read(File.join(__dir__, "..", "package.json"))) version = package['version'] source = { :git => 'https://github.com/facebook/react-native.git' } @@ -22,7 +22,8 @@ folly_version = '2018.10.22.00' boost_compiler_flags = '-Wno-documentation' Pod::Spec.new do |s| - s.name = "React-turbomodule-core" + s.name = "ReactCommon" + s.module_name = "ReactCommon" s.version = version s.summary = "-" # TODO s.homepage = "http://facebook.github.io/react-native/" @@ -30,20 +31,30 @@ Pod::Spec.new do |s| s.author = "Facebook, Inc. and its affiliates" s.platforms = { :ios => "9.0", :tvos => "9.2" } s.source = source - s.source_files = "*.{cpp,h}" + s.header_dir = "ReactCommon" # Use global header_dir for all subspecs for use_framework compatibility s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags - s.header_dir = "jsireact" - s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" } - s.xcconfig = { "OTHER_CFLAGS" => "$(inherited) -DRN_TURBO_MODULE_ENABLED" } + s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"", + "USE_HEADERMAP" => "YES", + "CLANG_CXX_LANGUAGE_STANDARD" => "c++14" } - s.dependency "React-Core/CxxBridge", version - s.dependency "React-cxxreact", version - s.dependency "React-jsi", version - s.dependency "Folly", folly_version - s.dependency "React-jscallinvoker", version + s.subspec "turbomodule" do |ss| + ss.dependency "React-Core/CxxBridge", version + ss.dependency "React-cxxreact", version + ss.dependency "React-jsi", version + ss.dependency "Folly", folly_version + ss.dependency "DoubleConversion" + ss.dependency "glog" + ss.dependency "React-jscallinvoker", version - s.subspec "core-ios" do |ss| - ss.source_files = "platform/ios/*.{mm,cpp,h}" - ss.header_dir = "jsireact" + ss.subspec "core" do |sss| + sss.source_files = "turbomodule/core/*.{cpp,h}", + "turbomodule/core/platform/ios/*.{mm,cpp,h}" + end + + ss.subspec "samples" do |sss| + sss.source_files = "turbomodule/samples/*.{cpp,h}", + "turbomodule/samples/platform/ios/*.{mm,cpp,h}" + sss.dependency "ReactCommon/turbomodule/core", version + end end end diff --git a/ReactCommon/turbomodule/core/BUCK b/ReactCommon/turbomodule/core/BUCK index 692896bf1d7..cb5ceb85629 100644 --- a/ReactCommon/turbomodule/core/BUCK +++ b/ReactCommon/turbomodule/core/BUCK @@ -11,7 +11,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "jsireact", + prefix = "ReactCommon", ), compiler_flags = [ "-fexceptions", @@ -26,7 +26,7 @@ rn_xplat_cxx_library( [ ("platform/android", "*.h"), ], - prefix = "jsireact", + prefix = "ReactCommon", ), fbandroid_srcs = glob( [ @@ -50,7 +50,7 @@ rn_xplat_cxx_library( [ ("platform/ios", "*.h"), ], - prefix = "jsireact", + prefix = "ReactCommon", ), ios_frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/ReactCommon/turbomodule/core/TurboCxxModule.cpp b/ReactCommon/turbomodule/core/TurboCxxModule.cpp index 779fdeb08b1..56663ccc99a 100644 --- a/ReactCommon/turbomodule/core/TurboCxxModule.cpp +++ b/ReactCommon/turbomodule/core/TurboCxxModule.cpp @@ -9,8 +9,8 @@ #include +#include #include -#include using namespace facebook; using namespace facebook::xplat::module; diff --git a/ReactCommon/turbomodule/core/TurboModuleBinding.cpp b/ReactCommon/turbomodule/core/TurboModuleBinding.cpp index 5b370eede9a..af71710787c 100644 --- a/ReactCommon/turbomodule/core/TurboModuleBinding.cpp +++ b/ReactCommon/turbomodule/core/TurboModuleBinding.cpp @@ -9,8 +9,8 @@ #include +#include #include -#include using namespace facebook; diff --git a/ReactCommon/turbomodule/core/TurboModuleBinding.h b/ReactCommon/turbomodule/core/TurboModuleBinding.h index 6195dcf39ad..49a4479ba7a 100644 --- a/ReactCommon/turbomodule/core/TurboModuleBinding.h +++ b/ReactCommon/turbomodule/core/TurboModuleBinding.h @@ -9,8 +9,8 @@ #include +#include #include -#include namespace facebook { namespace react { diff --git a/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.cpp b/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.cpp index be18e81d137..9f7880743e3 100644 --- a/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.cpp +++ b/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.cpp @@ -11,14 +11,13 @@ #include #include -#include -#import - +#include +#include #include +#include +#include #include #include -#include -#include #include "JavaTurboModule.h" diff --git a/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.h b/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.h index fa31b0c7326..891b67fe8a0 100644 --- a/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.h +++ b/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.h @@ -9,9 +9,9 @@ #include +#include #include #include -#include namespace facebook { namespace react { diff --git a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.h b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.h index ab0464ac857..fb47a06bdd3 100644 --- a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.h +++ b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.h @@ -12,11 +12,11 @@ #import #import #import +#import #import #import -#import -#import #import +#import #define RCT_IS_TURBO_MODULE_CLASS(klass) ((RCTTurboModuleEnabled() && [(klass) conformsToProtocol:@protocol(RCTTurboModule)])) #define RCT_IS_TURBO_MODULE_INSTANCE(module) RCT_IS_TURBO_MODULE_CLASS([(module) class]) diff --git a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.mm b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.mm index ce6c7616788..7209c8c264e 100644 --- a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.mm +++ b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.mm @@ -12,16 +12,16 @@ #import #import -#import #import -#import -#import -#import -#import -#import -#import +#import #import #import +#import +#import +#import +#import +#import +#import using namespace facebook; diff --git a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm index 02565b28945..beabd96de58 100644 --- a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm +++ b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm @@ -16,9 +16,9 @@ #import #import #import +#import +#import #import -#import -#import using namespace facebook; diff --git a/ReactCommon/turbomodule/samples/BUCK b/ReactCommon/turbomodule/samples/BUCK index 89cb8b362a8..de5d832a7e8 100644 --- a/ReactCommon/turbomodule/samples/BUCK +++ b/ReactCommon/turbomodule/samples/BUCK @@ -9,7 +9,7 @@ rn_xplat_cxx_library( [ ("", "*.h"), ], - prefix = "jsireact", + prefix = "ReactCommon", ), compiler_flags = [ "-fexceptions", @@ -24,7 +24,7 @@ rn_xplat_cxx_library( [ ("platform/android", "*.h"), ], - prefix = "jsireact", + prefix = "ReactCommon", ), fbandroid_srcs = glob( [ @@ -48,7 +48,7 @@ rn_xplat_cxx_library( [ ("platform/ios", "*.h"), ], - prefix = "jsireact", + prefix = "ReactCommon", ), ios_frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework", diff --git a/ReactCommon/turbomodule/samples/NativeSampleTurboCxxModuleSpecJSI.h b/ReactCommon/turbomodule/samples/NativeSampleTurboCxxModuleSpecJSI.h index a10fcf6cca1..9de5705b0e2 100644 --- a/ReactCommon/turbomodule/samples/NativeSampleTurboCxxModuleSpecJSI.h +++ b/ReactCommon/turbomodule/samples/NativeSampleTurboCxxModuleSpecJSI.h @@ -10,7 +10,7 @@ #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/turbomodule/samples/React-turbomodule-samples.podspec b/ReactCommon/turbomodule/samples/React-turbomodule-samples.podspec deleted file mode 100644 index 7f2f8256eef..00000000000 --- a/ReactCommon/turbomodule/samples/React-turbomodule-samples.podspec +++ /dev/null @@ -1,50 +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 - -folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2018.10.22.00' -boost_compiler_flags = '-Wno-documentation' - -Pod::Spec.new do |s| - s.name = "React-turbomodule-samples" - 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 = "*.{cpp,h}" - s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags - s.header_dir = "jsireact" - s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/Folly\" \"$(PODS_ROOT)/DoubleConversion\"" } - s.xcconfig = { "OTHER_CFLAGS" => "$(inherited) -DRN_TURBO_MODULE_ENABLED" } - - s.dependency "React-Core", version - s.dependency "React-cxxreact", version - s.dependency "React-jsi", version - s.dependency "React-turbomodule-core", version - s.dependency "Folly", folly_version - s.dependency "DoubleConversion" - - s.subspec "samples-ios" do |ss| - ss.source_files = "platform/ios/*.{mm,cpp,h}" - ss.header_dir = "jsireact" - end -end diff --git a/ReactCommon/turbomodule/samples/SampleTurboCxxModule.cpp b/ReactCommon/turbomodule/samples/SampleTurboCxxModule.cpp index 4062e05ed7e..43e56752cda 100644 --- a/ReactCommon/turbomodule/samples/SampleTurboCxxModule.cpp +++ b/ReactCommon/turbomodule/samples/SampleTurboCxxModule.cpp @@ -7,7 +7,7 @@ #import "SampleTurboCxxModule.h" -#import +#import using namespace facebook; diff --git a/ReactCommon/turbomodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h b/ReactCommon/turbomodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h index a3a1c589c8c..aeb1e230229 100644 --- a/ReactCommon/turbomodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h +++ b/ReactCommon/turbomodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h @@ -14,7 +14,7 @@ #import #ifdef RN_TURBO_MODULE_ENABLED -#import +#import #endif /** diff --git a/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.h b/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.h index 5987d53cd44..ca4c3b54adb 100644 --- a/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.h +++ b/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.h @@ -8,7 +8,7 @@ #pragma once #import -#import +#import /** * Sample backward-compatible RCTCxxModule-based module. diff --git a/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.mm b/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.mm index 873661c9779..59809377ed8 100644 --- a/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.mm +++ b/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.mm @@ -7,8 +7,8 @@ #import "RCTSampleTurboCxxModule.h" +#import #import -#import #import "SampleTurboCxxModuleLegacyImpl.h" using namespace facebook; diff --git a/scripts/autolink-ios.rb b/scripts/autolink-ios.rb index 9bdc7e72549..8b72aeb8ba6 100644 --- a/scripts/autolink-ios.rb +++ b/scripts/autolink-ios.rb @@ -37,7 +37,7 @@ def use_react_native! (options={}) pod 'React-jsi', :path => "#{prefix}/ReactCommon/jsi" pod 'React-jsiexecutor', :path => "#{prefix}/ReactCommon/jsiexecutor" pod 'React-jsinspector', :path => "#{prefix}/ReactCommon/jsinspector" - pod 'React-turbomodule-core', :path => "#{prefix}/ReactCommon/turbomodule/core" + pod 'ReactCommon/turbomodule/core', :path => "#{prefix}/ReactCommon" pod 'yoga', :path => "#{prefix}/ReactCommon/yoga" pod 'DoubleConversion', :podspec => "#{prefix}/third-party-podspecs/DoubleConversion.podspec" diff --git a/template/ios/Podfile b/template/ios/Podfile index 072b10ba5ad..e545dacb203 100644 --- a/template/ios/Podfile +++ b/template/ios/Podfile @@ -27,7 +27,7 @@ target 'HelloWorld' do pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi' pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor' pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector' - pod 'React-turbomodule-core', :path => "../node_modules/react-native/ReactCommon/turbomodule/core" + pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon" pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga' pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'