Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TM] Add TurboModules (jsireact) to Xcode project #25031

Closed
wants to merge 12 commits into from
Closed

[TM] Add TurboModules (jsireact) to Xcode project #25031

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
23ddca8
Add ReactCommon/turbomodule & jsinvoker to Xcode project
radex May 24, 2019
c5f3e22
Missing RCTTurboModule compiled & headers copied
radex May 24, 2019
8160a38
Fix accidental duplicate
radex May 24, 2019
19f143a
RCTTurboModule.xcodeproj
radex May 24, 2019
3581106
RCTTurboModules.xcodeproj - part 2
radex May 24, 2019
2469097
[TM] Compile RNTester with RCTTurboModules
radex May 24, 2019
7f8fdec
Get RNTester working
radex May 24, 2019
3e0f5a9
fix missing bits
radex May 24, 2019
2a5eae5
Remove references to TM bits from React.xcodeproj
radex May 24, 2019
ba4cc9c
RCTTurboModule{Core,Samples}
radex May 30, 2019
de5ac50
Merge branch 'master' of https://github.com/facebook/react-native int…
radex Jun 20, 2019
80fa21e
Remove changes to RNTester
radex Jun 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[TM] Compile RNTester with RCTTurboModules
  • Loading branch information
@radex
radex committed May 24, 2019
commit 2469097d857751b4eff24cb77f647db16e388ec8
45 changes: 45 additions & 0 deletions RNTester/RNTester.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
6862DFC92229DD2100684E03 /* libRCTTest-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6862DFAE2229DCC400684E03 /* libRCTTest-tvOS.a */; };
6862DFCF2229DFCC00684E03 /* Screenshot.m in Sources */ = {isa = PBXBuildFile; fileRef = 6862DFCE2229DFCC00684E03 /* Screenshot.m */; };
68FF44381CF6111500720EFD /* RCTBundleURLProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 68FF44371CF6111500720EFD /* RCTBundleURLProviderTests.m */; };
6E0C2F32229871BC000E3701 /* libRCTTurboModules.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E0C2F19229871AE000E3701 /* libRCTTurboModules.a */; };
834C36EC1AF8DED70019C93C /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 834C36D21AF8DA610019C93C /* libRCTSettings.a */; };
83636F8F1B53F22C009F943E /* RCTUIManagerScenarioTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 83636F8E1B53F22C009F943E /* RCTUIManagerScenarioTests.m */; };
8385CEF51B873B5C00C6273E /* RCTImageLoaderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8385CEF41B873B5C00C6273E /* RCTImageLoaderTests.m */; };
Expand Down Expand Up @@ -412,6 +413,20 @@
remoteGlobalIDString = 2D2A286E1D9B047700D4039D;
remoteInfo = "RCTTest-tvOS";
};
6E0C2F18229871AE000E3701 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6E0C2EFF229871AE000E3701 /* RCTTurboModules.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 6E0C2EC12298704B000E3701;
remoteInfo = RCTTurboModules;
};
6E0C2F30229871AE000E3701 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 6E6131FE22985B5C00AB39AD;
remoteInfo = turbomodule;
};
834C36D11AF8DA610019C93C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 13CC9D481AEED2B90020D1C2 /* RCTSettings.xcodeproj */;
Expand Down Expand Up @@ -551,6 +566,7 @@
6862DFCD2229DFCB00684E03 /* Screenshot.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Screenshot.h; sourceTree = "<group>"; };
6862DFCE2229DFCC00684E03 /* Screenshot.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Screenshot.m; sourceTree = "<group>"; };
68FF44371CF6111500720EFD /* RCTBundleURLProviderTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTBundleURLProviderTests.m; sourceTree = "<group>"; };
6E0C2EFF229871AE000E3701 /* RCTTurboModules.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTTurboModules.xcodeproj; path = ../React/RCTTurboModules.xcodeproj; sourceTree = "<group>"; };
83636F8E1B53F22C009F943E /* RCTUIManagerScenarioTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTUIManagerScenarioTests.m; sourceTree = "<group>"; };
8385CEF41B873B5C00C6273E /* RCTImageLoaderTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageLoaderTests.m; sourceTree = "<group>"; };
8385CF031B87479200C6273E /* RCTImageLoaderHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageLoaderHelpers.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -605,6 +621,7 @@
134180011AA9153C003F314A /* libRCTText.a in Frameworks */,
D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */,
139FDEDB1B0651FB00C62182 /* libRCTWebSocket.a in Frameworks */,
6E0C2F32229871BC000E3701 /* libRCTTurboModules.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -689,6 +706,7 @@
13417FEA1AA914B8003F314A /* RCTText.xcodeproj */,
D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */,
139FDECA1B0651EA00C62182 /* RCTWebSocket.xcodeproj */,
6E0C2EFF229871AE000E3701 /* RCTTurboModules.xcodeproj */,
);
name = Libraries;
sourceTree = "<group>";
Expand Down Expand Up @@ -854,6 +872,7 @@
EDEBC7CA214C503A00DD5AC8 /* libjsiexecutor.a */,
ED2970952150246200B7C4FE /* libjsi-tvOS.a */,
ED2970972150246200B7C4FE /* libjsiexecutor-tvOS.a */,
6E0C2F31229871AE000E3701 /* libturbomodule.a */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -1003,6 +1022,14 @@
path = NativeModuleExample;
sourceTree = "<group>";
};
6E0C2F00229871AE000E3701 /* Products */ = {
isa = PBXGroup;
children = (
6E0C2F19229871AE000E3701 /* libRCTTurboModules.a */,
);
name = Products;
sourceTree = "<group>";
};
834C36CE1AF8DA610019C93C /* Products */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1279,6 +1306,10 @@
ProductGroup = 13417FEB1AA914B8003F314A /* Products */;
ProjectRef = 13417FEA1AA914B8003F314A /* RCTText.xcodeproj */;
},
{
ProductGroup = 6E0C2F00229871AE000E3701 /* Products */;
ProjectRef = 6E0C2EFF229871AE000E3701 /* RCTTurboModules.xcodeproj */;
},
{
ProductGroup = D85B82921AB6D5CE003F4FE2 /* Products */;
ProjectRef = D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */;
Expand Down Expand Up @@ -1558,6 +1589,20 @@
remoteRef = 6862DFAD2229DCC400684E03 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
6E0C2F19229871AE000E3701 /* libRCTTurboModules.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libRCTTurboModules.a;
remoteRef = 6E0C2F18229871AE000E3701 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
6E0C2F31229871AE000E3701 /* libturbomodule.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libturbomodule.a;
remoteRef = 6E0C2F30229871AE000E3701 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
834C36D21AF8DA610019C93C /* libRCTSettings.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
Expand Down
24 changes: 12 additions & 12 deletions React/RCTTurboModules.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
objects = {

/* Begin PBXBuildFile section */
6E0C2F342298727D000E3701 /* RCTTurboModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E61351B22986FCB00AB39AD /* RCTTurboModule.h */; };
6E0C2F3522987280000E3701 /* RCTTurboModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6E61351822986FCB00AB39AD /* RCTTurboModule.mm */; };
6E0C2F382298730B000E3701 /* RCTTurboModuleManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6E61351922986FCB00AB39AD /* RCTTurboModuleManager.mm */; };
6E0C2F392298730B000E3701 /* RCTTurboModuleManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E61351A22986FCB00AB39AD /* RCTTurboModuleManager.h */; };
6E61353922986FDB00AB39AD /* TurboModuleUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E61351322986FCB00AB39AD /* TurboModuleUtils.cpp */; };
6E61353A22986FDB00AB39AD /* TurboModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E61351422986FCB00AB39AD /* TurboModule.cpp */; };
6E61353B22986FDB00AB39AD /* TurboCxxModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6E61351F22986FCB00AB39AD /* TurboCxxModule.cpp */; };
Expand All @@ -25,12 +29,6 @@
6E6135482298700C00AB39AD /* LongLivedObject.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 6E61352222986FCB00AB39AD /* LongLivedObject.h */; };
6E6135492298700C00AB39AD /* TurboModuleUtils.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 6E61352422986FCB00AB39AD /* TurboModuleUtils.h */; };
6E61354A2298700C00AB39AD /* TurboModuleBinding.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 6E61352722986FCB00AB39AD /* TurboModuleBinding.h */; };
6E61354B2298703600AB39AD /* RCTTurboModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6E61351822986FCB00AB39AD /* RCTTurboModule.mm */; };
6E61354C2298703600AB39AD /* RCTTurboModuleManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6E61351922986FCB00AB39AD /* RCTTurboModuleManager.mm */; };
6E61354D2298703900AB39AD /* RCTTurboModuleManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E61351A22986FCB00AB39AD /* RCTTurboModuleManager.h */; };
6E61354E2298703900AB39AD /* RCTTurboModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E61351B22986FCB00AB39AD /* RCTTurboModule.h */; };
6E61354F2298703F00AB39AD /* RCTTurboModuleManager.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 6E61351A22986FCB00AB39AD /* RCTTurboModuleManager.h */; };
6E6135502298703F00AB39AD /* RCTTurboModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 6E61351B22986FCB00AB39AD /* RCTTurboModule.h */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
Expand All @@ -40,8 +38,6 @@
dstPath = include/jsireact;
dstSubfolderSpec = 16;
files = (
6E61354F2298703F00AB39AD /* RCTTurboModuleManager.h in Copy Headers */,
6E6135502298703F00AB39AD /* RCTTurboModule.h in Copy Headers */,
6E6135452298700C00AB39AD /* JSCallInvoker.h in Copy Headers */,
6E6135462298700C00AB39AD /* TurboCxxModule.h in Copy Headers */,
6E6135472298700C00AB39AD /* TurboModule.h in Copy Headers */,
Expand All @@ -56,6 +52,7 @@

/* Begin PBXFileReference section */
6E0C2EC12298704B000E3701 /* libRCTTurboModules.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTTurboModules.a; sourceTree = BUILT_PRODUCTS_DIR; };
6E0C2F33229871F4000E3701 /* third-party.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "third-party.xcconfig"; sourceTree = "<group>"; };
6E61350D22986FCA00AB39AD /* BridgeJSCallInvoker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BridgeJSCallInvoker.h; sourceTree = "<group>"; };
6E61350E22986FCA00AB39AD /* BridgeJSCallInvoker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = BridgeJSCallInvoker.cpp; sourceTree = "<group>"; };
6E61350F22986FCA00AB39AD /* JSCallInvoker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JSCallInvoker.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -204,6 +201,7 @@
children = (
6E61350922986FCA00AB39AD /* jscallinvoker */,
6E61351122986FCB00AB39AD /* turbomodule */,
6E0C2F33229871F4000E3701 /* third-party.xcconfig */,
6E0C2EC12298704B000E3701 /* libRCTTurboModules.a */,
);
indentWidth = 2;
Expand All @@ -219,13 +217,13 @@
buildActionMask = 2147483647;
files = (
6E61353E22986FE400AB39AD /* TurboCxxModule.h in Headers */,
6E61354E2298703900AB39AD /* RCTTurboModule.h in Headers */,
6E61354022986FE400AB39AD /* LongLivedObject.h in Headers */,
6E61354322986FF600AB39AD /* JSCallInvoker.h in Headers */,
6E61354D2298703900AB39AD /* RCTTurboModuleManager.h in Headers */,
6E0C2F392298730B000E3701 /* RCTTurboModuleManager.h in Headers */,
6E61354222986FF600AB39AD /* BridgeJSCallInvoker.h in Headers */,
6E61353F22986FE400AB39AD /* TurboModule.h in Headers */,
6E61354122986FE400AB39AD /* TurboModuleUtils.h in Headers */,
6E0C2F342298727D000E3701 /* RCTTurboModule.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -286,10 +284,10 @@
6E61354422986FF800AB39AD /* BridgeJSCallInvoker.cpp in Sources */,
6E61353D22986FDB00AB39AD /* TurboModuleBinding.cpp in Sources */,
6E61353A22986FDB00AB39AD /* TurboModule.cpp in Sources */,
6E61354B2298703600AB39AD /* RCTTurboModule.mm in Sources */,
6E0C2F3522987280000E3701 /* RCTTurboModule.mm in Sources */,
6E61353922986FDB00AB39AD /* TurboModuleUtils.cpp in Sources */,
6E61353B22986FDB00AB39AD /* TurboCxxModule.cpp in Sources */,
6E61354C2298703600AB39AD /* RCTTurboModuleManager.mm in Sources */,
6E0C2F382298730B000E3701 /* RCTTurboModuleManager.mm in Sources */,
6E61353C22986FDB00AB39AD /* LongLivedObject.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -299,6 +297,7 @@
/* Begin XCBuildConfiguration section */
6E6131FC22985B5C00AB39AD /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 6E0C2F33229871F4000E3701 /* third-party.xcconfig */;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_STATIC_ANALYZER_MODE = deep;
Expand All @@ -313,6 +312,7 @@
};
6E6131FD22985B5C00AB39AD /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 6E0C2F33229871F4000E3701 /* third-party.xcconfig */;
buildSettings = {
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_STATIC_ANALYZER_MODE = deep;
Expand Down
6 changes: 6 additions & 0 deletions React/React.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -999,6 +999,9 @@
66CD94B71F1045E700CB3C7C /* RCTMaskedViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 66CD94B01F1045E700CB3C7C /* RCTMaskedViewManager.m */; };
66CD94B81F1045E700CB3C7C /* RCTMaskedViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 66CD94B01F1045E700CB3C7C /* RCTMaskedViewManager.m */; };
68EFE4EE1CF6EB3900A1DE13 /* RCTBundleURLProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 68EFE4ED1CF6EB3900A1DE13 /* RCTBundleURLProvider.m */; };
6E0C2F36229872CD000E3701 /* RCTCxxConvert.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = C60128A91F3D1258009DF9FF /* RCTCxxConvert.h */; };
ericlewis marked this conversation as resolved.
Show resolved Hide resolved
6E0C2F37229872E8000E3701 /* RCTManagedPointer.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = C654505D1F3BD9280090799B /* RCTManagedPointer.h */; };
6E0C2F3A2298731F000E3701 /* RCTCxxModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 13134C801E296B2A00B9F3CB /* RCTCxxModule.h */; };
6E6131FF22985B7B00AB39AD /* TurboCxxModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 6E6131C122985B3C00AB39AD /* TurboCxxModule.h */; };
6E61320022985B7B00AB39AD /* TurboModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 6E6131CC22985B3C00AB39AD /* TurboModule.h */; };
6E61320122985B7B00AB39AD /* LongLivedObject.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 6E6131CE22985B3C00AB39AD /* LongLivedObject.h */; };
Expand Down Expand Up @@ -1579,7 +1582,10 @@
dstPath = include/React;
dstSubfolderSpec = 16;
files = (
6E0C2F3A2298731F000E3701 /* RCTCxxModule.h in Copy Headers */,
6E0C2F37229872E8000E3701 /* RCTManagedPointer.h in Copy Headers */,
5C60EB5A226442950018C04F /* RCTCxxBridgeDelegate.h in Copy Headers */,
6E0C2F36229872CD000E3701 /* RCTCxxConvert.h in Copy Headers */,
5C60EB57226441470018C04F /* JSCExecutorFactory.h in Copy Headers */,
589515E12231ADE00036BDE0 /* RCTSurfacePresenterStub.h in Copy Headers */,
39C50FF92046EACF00CEE534 /* RCTVersion.h in Copy Headers */,
Expand Down