diff --git a/Examples/2048/2048.xcodeproj/project.pbxproj b/Examples/2048/2048.xcodeproj/project.pbxproj index 696d9331d..bf1fb02aa 100644 --- a/Examples/2048/2048.xcodeproj/project.pbxproj +++ b/Examples/2048/2048.xcodeproj/project.pbxproj @@ -12,8 +12,8 @@ 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; + 1461632D1AC3E23900C2F5AD /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1461632C1AC3E22900C2F5AD /* libReact.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; - 8323482C1A77B59500B55238 /* libReactKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832348291A77B50100B55238 /* libReactKit.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -24,6 +24,13 @@ remoteGlobalIDString = 134814201AA4EA6300B7C361; remoteInfo = RCTAnimation; }; + 1461632B1AC3E22900C2F5AD /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146163271AC3E22900C2F5AD /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; + remoteInfo = React; + }; 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */; @@ -31,13 +38,6 @@ remoteGlobalIDString = 58B5119B1A9E6C1200147676; remoteInfo = RCTText; }; - 832348281A77B50100B55238 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 834D32361A76971A00F38302 /* ReactKit.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; - remoteInfo = ReactKit; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -49,8 +49,8 @@ 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = 2048/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = 2048/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = 2048/main.m; sourceTree = ""; }; + 146163271AC3E22900C2F5AD /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../../React/React.xcodeproj; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../../Libraries/Text/RCTText.xcodeproj; sourceTree = ""; }; - 834D32361A76971A00F38302 /* ReactKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactKit.xcodeproj; path = ../../ReactKit/ReactKit.xcodeproj; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -58,8 +58,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 1461632D1AC3E23900C2F5AD /* libReact.a in Frameworks */, 13ACB6741AC2117000FF4204 /* libRCTAnimation.a in Frameworks */, - 8323482C1A77B59500B55238 /* libReactKit.a in Frameworks */, 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -88,10 +88,18 @@ name = 2048; sourceTree = ""; }; + 146163281AC3E22900C2F5AD /* Products */ = { + isa = PBXGroup; + children = ( + 1461632C1AC3E22900C2F5AD /* libReact.a */, + ); + name = Products; + sourceTree = ""; + }; 832341AE1AAA6A7D00B99B32 /* Libraries */ = { isa = PBXGroup; children = ( - 834D32361A76971A00F38302 /* ReactKit.xcodeproj */, + 146163271AC3E22900C2F5AD /* React.xcodeproj */, 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */, 13ACB66C1AC2113500FF4204 /* RCTAnimation.xcodeproj */, ); @@ -106,14 +114,6 @@ name = Products; sourceTree = ""; }; - 832348241A77B50100B55238 /* Products */ = { - isa = PBXGroup; - children = ( - 832348291A77B50100B55238 /* libReactKit.a */, - ); - name = Products; - sourceTree = ""; - }; 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( @@ -181,8 +181,8 @@ ProjectRef = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */; }, { - ProductGroup = 832348241A77B50100B55238 /* Products */; - ProjectRef = 834D32361A76971A00F38302 /* ReactKit.xcodeproj */; + ProductGroup = 146163281AC3E22900C2F5AD /* Products */; + ProjectRef = 146163271AC3E22900C2F5AD /* React.xcodeproj */; }, ); projectRoot = ""; @@ -200,6 +200,13 @@ remoteRef = 13ACB6701AC2113600FF4204 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 1461632C1AC3E22900C2F5AD /* libReact.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libReact.a; + remoteRef = 1461632B1AC3E22900C2F5AD /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 832341B51AAA6A8300B99B32 /* libRCTText.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -207,13 +214,6 @@ remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 832348291A77B50100B55238 /* libReactKit.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libReactKit.a; - remoteRef = 832348281A77B50100B55238 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -257,6 +257,11 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../../React/**", + ); INFOPLIST_FILE = "$(SRCROOT)/2048/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = "-ObjC"; @@ -268,6 +273,11 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../../React/**", + ); INFOPLIST_FILE = "$(SRCROOT)/2048/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = "-ObjC"; @@ -312,7 +322,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = YES; @@ -352,7 +362,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = NO; diff --git a/Examples/Movies/Movies.xcodeproj/project.pbxproj b/Examples/Movies/Movies.xcodeproj/project.pbxproj index 8dfb1be4e..29eaf91c4 100644 --- a/Examples/Movies/Movies.xcodeproj/project.pbxproj +++ b/Examples/Movies/Movies.xcodeproj/project.pbxproj @@ -14,8 +14,8 @@ 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 140D9B661AC36C42004F25EE /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14312D241AC3654D00CDC950 /* libRCTLinking.a */; }; + 14A2D4421AC3E43800CC738A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14A2D4411AC3E41A00CC738A /* libReact.a */; }; 58C5726B1AA6239E00CDF9C8 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58C5725B1AA6236500CDF9C8 /* libRCTText.a */; }; - 58C5726C1AA623A200CDF9C8 /* libReactKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58C572681AA6236600CDF9C8 /* libReactKit.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -40,6 +40,13 @@ remoteGlobalIDString = 134814201AA4EA6300B7C361; remoteInfo = RCTLinking; }; + 14A2D4401AC3E41A00CC738A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 14A2D43C1AC3E41A00CC738A /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; + remoteInfo = React; + }; 58C5725A1AA6236500CDF9C8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 587650F61A9EB120008B8F17 /* RCTText.xcodeproj */; @@ -47,13 +54,6 @@ remoteGlobalIDString = 58B5119B1A9E6C1200147676; remoteInfo = RCTText; }; - 58C572671AA6236600CDF9C8 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 587650F91A9EB120008B8F17 /* ReactKit.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; - remoteInfo = ReactKit; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -67,8 +67,8 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Movies/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Movies/main.m; sourceTree = ""; }; 14312D1E1AC3654D00CDC950 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = ../../Libraries/LinkingIOS/RCTLinking.xcodeproj; sourceTree = ""; }; + 14A2D43C1AC3E41A00CC738A /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../../React/React.xcodeproj; sourceTree = ""; }; 587650F61A9EB120008B8F17 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../../Libraries/Text/RCTText.xcodeproj; sourceTree = SOURCE_ROOT; }; - 587650F91A9EB120008B8F17 /* ReactKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactKit.xcodeproj; path = ../../ReactKit/ReactKit.xcodeproj; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -76,11 +76,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 14A2D4421AC3E43800CC738A /* libReact.a in Frameworks */, 140D9B661AC36C42004F25EE /* libRCTLinking.a in Frameworks */, 1341801E1AA91750003F314A /* libRCTNetwork.a in Frameworks */, 13442C061AA90EA00037E5B0 /* libRCTImage.a in Frameworks */, 58C5726B1AA6239E00CDF9C8 /* libRCTText.a in Frameworks */, - 58C5726C1AA623A200CDF9C8 /* libReactKit.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -124,14 +124,22 @@ name = Products; sourceTree = ""; }; + 14A2D43D1AC3E41A00CC738A /* Products */ = { + isa = PBXGroup; + children = ( + 14A2D4411AC3E41A00CC738A /* libReact.a */, + ); + name = Products; + sourceTree = ""; + }; 58C571FC1AA6124500CDF9C8 /* Libraries */ = { isa = PBXGroup; children = ( + 14A2D43C1AC3E41A00CC738A /* React.xcodeproj */, 14312D1E1AC3654D00CDC950 /* RCTLinking.xcodeproj */, 134180151AA91740003F314A /* RCTNetwork.xcodeproj */, 13442C001AA90E7D0037E5B0 /* RCTImage.xcodeproj */, 587650F61A9EB120008B8F17 /* RCTText.xcodeproj */, - 587650F91A9EB120008B8F17 /* ReactKit.xcodeproj */, ); name = Libraries; sourceTree = ""; @@ -144,14 +152,6 @@ name = Products; sourceTree = ""; }; - 58C5725C1AA6236500CDF9C8 /* Products */ = { - isa = PBXGroup; - children = ( - 58C572681AA6236600CDF9C8 /* libReactKit.a */, - ); - name = Products; - sourceTree = ""; - }; 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( @@ -227,8 +227,8 @@ ProjectRef = 587650F61A9EB120008B8F17 /* RCTText.xcodeproj */; }, { - ProductGroup = 58C5725C1AA6236500CDF9C8 /* Products */; - ProjectRef = 587650F91A9EB120008B8F17 /* ReactKit.xcodeproj */; + ProductGroup = 14A2D43D1AC3E41A00CC738A /* Products */; + ProjectRef = 14A2D43C1AC3E41A00CC738A /* React.xcodeproj */; }, ); projectRoot = ""; @@ -260,6 +260,13 @@ remoteRef = 14312D231AC3654D00CDC950 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 14A2D4411AC3E41A00CC738A /* libReact.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libReact.a; + remoteRef = 14A2D4401AC3E41A00CC738A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 58C5725B1AA6236500CDF9C8 /* libRCTText.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -267,13 +274,6 @@ remoteRef = 58C5725A1AA6236500CDF9C8 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 58C572681AA6236600CDF9C8 /* libReactKit.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libReactKit.a; - remoteRef = 58C572671AA6236600CDF9C8 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -320,7 +320,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); INFOPLIST_FILE = "$(SRCROOT)/Movies/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -338,7 +338,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); INFOPLIST_FILE = "$(SRCROOT)/Movies/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -386,7 +386,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = YES; @@ -426,7 +426,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = NO; diff --git a/Examples/SampleApp/SampleApp.xcodeproj/project.pbxproj b/Examples/SampleApp/SampleApp.xcodeproj/project.pbxproj index ba0c1d97b..76c7963c0 100644 --- a/Examples/SampleApp/SampleApp.xcodeproj/project.pbxproj +++ b/Examples/SampleApp/SampleApp.xcodeproj/project.pbxproj @@ -19,8 +19,8 @@ 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; + 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; - 8323482C1A77B59500B55238 /* libReactKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832348291A77B50100B55238 /* libReactKit.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -73,6 +73,13 @@ remoteGlobalIDString = 832C81801AAF6DEF007FA2F7; remoteInfo = RCTVibration; }; + 146834031AC3E56700842450 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; + remoteInfo = React; + }; 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */; @@ -80,13 +87,6 @@ remoteGlobalIDString = 58B5119B1A9E6C1200147676; remoteInfo = RCTText; }; - 832348281A77B50100B55238 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 834D32361A76971A00F38302 /* ReactKit.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; - remoteInfo = ReactKit; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -105,8 +105,8 @@ 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = iOS/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = iOS/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = iOS/main.m; sourceTree = ""; }; + 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../../React/React.xcodeproj; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../../Libraries/Text/RCTText.xcodeproj; sourceTree = ""; }; - 834D32361A76971A00F38302 /* ReactKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactKit.xcodeproj; path = ../../ReactKit/ReactKit.xcodeproj; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -115,6 +115,7 @@ buildActionMask = 2147483647; files = ( 00481BEA1AC0C89D00671115 /* libicucore.dylib in Frameworks */, + 146834051AC3E58100842450 /* libReact.a in Frameworks */, 00481BE81AC0C86700671115 /* libRCTWebSocketDebugger.a in Frameworks */, 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */, 00C302E61ABCBA2D00DB3ED1 /* libRCTAdSupport.a in Frameworks */, @@ -122,7 +123,6 @@ 00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */, 00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */, 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */, - 8323482C1A77B59500B55238 /* libReactKit.a in Frameworks */, 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -199,10 +199,18 @@ name = SampleApp; sourceTree = ""; }; + 146834001AC3E56700842450 /* Products */ = { + isa = PBXGroup; + children = ( + 146834041AC3E56700842450 /* libReact.a */, + ); + name = Products; + sourceTree = ""; + }; 832341AE1AAA6A7D00B99B32 /* Libraries */ = { isa = PBXGroup; children = ( - 834D32361A76971A00F38302 /* ReactKit.xcodeproj */, + 146833FF1AC3E56700842450 /* React.xcodeproj */, 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */, 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */, 00C302AF1ABCB8E700DB3ED1 /* RCTAdSupport.xcodeproj */, @@ -224,14 +232,6 @@ name = Products; sourceTree = ""; }; - 832348241A77B50100B55238 /* Products */ = { - isa = PBXGroup; - children = ( - 832348291A77B50100B55238 /* libReactKit.a */, - ); - name = Products; - sourceTree = ""; - }; 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( @@ -323,8 +323,8 @@ ProjectRef = 00481BDB1AC0C7FA00671115 /* RCTWebSocketDebugger.xcodeproj */; }, { - ProductGroup = 832348241A77B50100B55238 /* Products */; - ProjectRef = 834D32361A76971A00F38302 /* ReactKit.xcodeproj */; + ProductGroup = 146834001AC3E56700842450 /* Products */; + ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */; }, ); projectRoot = ""; @@ -384,6 +384,13 @@ remoteRef = 00C302E31ABCB9EE00DB3ED1 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 146834041AC3E56700842450 /* libReact.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libReact.a; + remoteRef = 146834031AC3E56700842450 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 832341B51AAA6A8300B99B32 /* libRCTText.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -391,13 +398,6 @@ remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 832348291A77B50100B55238 /* libReactKit.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libReactKit.a; - remoteRef = 832348281A77B50100B55238 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -441,6 +441,11 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../../React/**", + ); INFOPLIST_FILE = "$(SRCROOT)/iOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = "-ObjC"; @@ -452,6 +457,11 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../../React/**", + ); INFOPLIST_FILE = "$(SRCROOT)/iOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = "-ObjC"; @@ -496,7 +506,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = YES; @@ -536,7 +546,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = NO; diff --git a/Examples/TicTacToe/TicTacToe.xcodeproj/project.pbxproj b/Examples/TicTacToe/TicTacToe.xcodeproj/project.pbxproj index 48b484437..c1333f78b 100644 --- a/Examples/TicTacToe/TicTacToe.xcodeproj/project.pbxproj +++ b/Examples/TicTacToe/TicTacToe.xcodeproj/project.pbxproj @@ -12,7 +12,7 @@ 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; - 58C572501AA6229900CDF9C8 /* libReactKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58C572471AA6224300CDF9C8 /* libReactKit.a */; }; + 144C5F691AC3E5E300B004E7 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 144C5F681AC3E5D800B004E7 /* libReact.a */; }; 58C572511AA6229D00CDF9C8 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58C5724D1AA6224400CDF9C8 /* libRCTText.a */; }; /* End PBXBuildFile section */ @@ -24,12 +24,12 @@ remoteGlobalIDString = 58B5115D1A9E6B3D00147676; remoteInfo = RCTImage; }; - 58C572461AA6224300CDF9C8 /* PBXContainerItemProxy */ = { + 144C5F671AC3E5D800B004E7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 587650E31A9EB0DF008B8F17 /* ReactKit.xcodeproj */; + containerPortal = 144C5F631AC3E5D800B004E7 /* React.xcodeproj */; proxyType = 2; remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; - remoteInfo = ReactKit; + remoteInfo = React; }; 58C5724C1AA6224400CDF9C8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -49,8 +49,8 @@ 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = TicTacToe/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = TicTacToe/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = TicTacToe/main.m; sourceTree = ""; }; + 144C5F631AC3E5D800B004E7 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../../React/React.xcodeproj; sourceTree = ""; }; 587650DA1A9EB0DB008B8F17 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../../Libraries/Text/RCTText.xcodeproj; sourceTree = ""; }; - 587650E31A9EB0DF008B8F17 /* ReactKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactKit.xcodeproj; path = ../../ReactKit/ReactKit.xcodeproj; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -58,8 +58,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 144C5F691AC3E5E300B004E7 /* libReact.a in Frameworks */, 1341803E1AA91802003F314A /* libRCTImage.a in Frameworks */, - 58C572501AA6229900CDF9C8 /* libReactKit.a in Frameworks */, 58C572511AA6229D00CDF9C8 /* libRCTText.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -88,24 +88,24 @@ name = TicTacToe; sourceTree = ""; }; + 144C5F641AC3E5D800B004E7 /* Products */ = { + isa = PBXGroup; + children = ( + 144C5F681AC3E5D800B004E7 /* libReact.a */, + ); + name = Products; + sourceTree = ""; + }; 58C572071AA6126D00CDF9C8 /* Libraries */ = { isa = PBXGroup; children = ( + 144C5F631AC3E5D800B004E7 /* React.xcodeproj */, 134180381AA917ED003F314A /* RCTImage.xcodeproj */, 587650DA1A9EB0DB008B8F17 /* RCTText.xcodeproj */, - 587650E31A9EB0DF008B8F17 /* ReactKit.xcodeproj */, ); name = Libraries; sourceTree = ""; }; - 58C572411AA6224300CDF9C8 /* Products */ = { - isa = PBXGroup; - children = ( - 58C572471AA6224300CDF9C8 /* libReactKit.a */, - ); - name = Products; - sourceTree = ""; - }; 58C572481AA6224300CDF9C8 /* Products */ = { isa = PBXGroup; children = ( @@ -181,8 +181,8 @@ ProjectRef = 587650DA1A9EB0DB008B8F17 /* RCTText.xcodeproj */; }, { - ProductGroup = 58C572411AA6224300CDF9C8 /* Products */; - ProjectRef = 587650E31A9EB0DF008B8F17 /* ReactKit.xcodeproj */; + ProductGroup = 144C5F641AC3E5D800B004E7 /* Products */; + ProjectRef = 144C5F631AC3E5D800B004E7 /* React.xcodeproj */; }, ); projectRoot = ""; @@ -200,11 +200,11 @@ remoteRef = 1341803C1AA917ED003F314A /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 58C572471AA6224300CDF9C8 /* libReactKit.a */ = { + 144C5F681AC3E5D800B004E7 /* libReact.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libReactKit.a; - remoteRef = 58C572461AA6224300CDF9C8 /* PBXContainerItemProxy */; + path = libReact.a; + remoteRef = 144C5F671AC3E5D800B004E7 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; 58C5724D1AA6224400CDF9C8 /* libRCTText.a */ = { @@ -257,6 +257,11 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../../React/**", + ); INFOPLIST_FILE = "$(SRCROOT)/TicTacToe/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; @@ -269,6 +274,11 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../../React/**", + ); INFOPLIST_FILE = "$(SRCROOT)/TicTacToe/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = "$(inherited)"; @@ -314,7 +324,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = YES; @@ -354,7 +364,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = NO; diff --git a/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj b/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj index 0b4496435..e5e783e6c 100644 --- a/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj +++ b/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj @@ -12,7 +12,6 @@ 00D2771C1AB8C55500DC1E48 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 00D2771B1AB8C55500DC1E48 /* libicucore.dylib */; }; 13417FE91AA91432003F314A /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13417FE81AA91428003F314A /* libRCTImage.a */; }; 134180011AA9153C003F314A /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13417FEF1AA914B8003F314A /* libRCTText.a */; }; - 134180021AA9153C003F314A /* libReactKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 13417FFF1AA91531003F314A /* libReactKit.a */; }; 1341802C1AA9178B003F314A /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1341802B1AA91779003F314A /* libRCTNetwork.a */; }; 134454601AAFCABD003F0779 /* libRCTAdSupport.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1344545A1AAFCAAE003F0779 /* libRCTAdSupport.a */; }; 134A8A2A1AACED7A00945AAE /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 134A8A251AACED6A00945AAE /* libRCTGeolocation.a */; }; @@ -21,6 +20,7 @@ 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 147CED4C1AB3532B00DA3E4C /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 147CED4B1AB34F8C00DA3E4C /* libRCTActionSheet.a */; }; + 14AADF051AC3DBB1002390C9 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14AADF041AC3DB95002390C9 /* libReact.a */; }; 14DC67F41AB71881001358AB /* libRCTPushNotification.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14DC67F11AB71876001358AB /* libRCTPushNotification.a */; }; 58005BF21ABA80A60062E044 /* libRCTTest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58005BEE1ABA80530062E044 /* libRCTTest.a */; }; D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D85B829C1AB6D5CE003F4FE2 /* libRCTVibration.a */; }; @@ -55,13 +55,6 @@ remoteGlobalIDString = 58B5119B1A9E6C1200147676; remoteInfo = RCTText; }; - 13417FFE1AA91531003F314A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 13417FFA1AA91531003F314A /* ReactKit.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; - remoteInfo = ReactKit; - }; 1341802A1AA91779003F314A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 134180261AA91779003F314A /* RCTNetwork.xcodeproj */; @@ -90,6 +83,13 @@ remoteGlobalIDString = 134814201AA4EA6300B7C361; remoteInfo = RCTActionSheet; }; + 14AADF031AC3DB95002390C9 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; + remoteInfo = React; + }; 14DC67F01AB71876001358AB /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 14DC67E71AB71876001358AB /* RCTPushNotification.xcodeproj */; @@ -121,7 +121,6 @@ 00D2771B1AB8C55500DC1E48 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; }; 13417FE31AA91428003F314A /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = ../../Libraries/Image/RCTImage.xcodeproj; sourceTree = ""; }; 13417FEA1AA914B8003F314A /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../../Libraries/Text/RCTText.xcodeproj; sourceTree = ""; }; - 13417FFA1AA91531003F314A /* ReactKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactKit.xcodeproj; path = ../../ReactKit/ReactKit.xcodeproj; sourceTree = ""; }; 134180261AA91779003F314A /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = ../../Libraries/Network/RCTNetwork.xcodeproj; sourceTree = ""; }; 134454551AAFCAAE003F0779 /* RCTAdSupport.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAdSupport.xcodeproj; path = ../../Libraries/AdSupport/RCTAdSupport.xcodeproj; sourceTree = ""; }; 134A8A201AACED6A00945AAE /* RCTGeolocation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTGeolocation.xcodeproj; path = ../../Libraries/Geolocation/RCTGeolocation.xcodeproj; sourceTree = ""; }; @@ -132,6 +131,7 @@ 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = UIExplorer/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = UIExplorer/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = UIExplorer/main.m; sourceTree = ""; }; + 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../../React/React.xcodeproj; sourceTree = ""; }; 14DC67E71AB71876001358AB /* RCTPushNotification.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTPushNotification.xcodeproj; path = ../../Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj; sourceTree = ""; }; 14E0EEC81AB118F7000DECC3 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = ../../Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj; sourceTree = ""; }; 58005BE41ABA80530062E044 /* RCTTest.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTTest.xcodeproj; path = ../../Libraries/RCTTest/RCTTest.xcodeproj; sourceTree = ""; }; @@ -151,6 +151,7 @@ buildActionMask = 2147483647; files = ( 00D2771C1AB8C55500DC1E48 /* libicucore.dylib in Frameworks */, + 14AADF051AC3DBB1002390C9 /* libReact.a in Frameworks */, 00D2771A1AB8C3E100DC1E48 /* libRCTWebSocketDebugger.a in Frameworks */, 58005BF21ABA80A60062E044 /* libRCTTest.a in Frameworks */, D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */, @@ -160,7 +161,6 @@ 134A8A2A1AACED7A00945AAE /* libRCTGeolocation.a in Frameworks */, 1341802C1AA9178B003F314A /* libRCTNetwork.a in Frameworks */, 134180011AA9153C003F314A /* libRCTText.a in Frameworks */, - 134180021AA9153C003F314A /* libReactKit.a in Frameworks */, 13417FE91AA91432003F314A /* libRCTImage.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -196,7 +196,7 @@ 1316A21D1AA397F400C0188E /* Libraries */ = { isa = PBXGroup; children = ( - 13417FFA1AA91531003F314A /* ReactKit.xcodeproj */, + 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */, 14DC67E71AB71876001358AB /* RCTPushNotification.xcodeproj */, 14E0EEC81AB118F7000DECC3 /* RCTActionSheet.xcodeproj */, 134454551AAFCAAE003F0779 /* RCTAdSupport.xcodeproj */, @@ -228,14 +228,6 @@ name = Products; sourceTree = ""; }; - 13417FFB1AA91531003F314A /* Products */ = { - isa = PBXGroup; - children = ( - 13417FFF1AA91531003F314A /* libReactKit.a */, - ); - name = Products; - sourceTree = ""; - }; 134180271AA91779003F314A /* Products */ = { isa = PBXGroup; children = ( @@ -281,6 +273,14 @@ name = Products; sourceTree = ""; }; + 14AADF001AC3DB95002390C9 /* Products */ = { + isa = PBXGroup; + children = ( + 14AADF041AC3DB95002390C9 /* libReact.a */, + ); + name = Products; + sourceTree = ""; + }; 14DC67E81AB71876001358AB /* Products */ = { isa = PBXGroup; children = ( @@ -430,8 +430,8 @@ ProjectRef = 00D2770E1AB8C2C700DC1E48 /* RCTWebSocketDebugger.xcodeproj */; }, { - ProductGroup = 13417FFB1AA91531003F314A /* Products */; - ProjectRef = 13417FFA1AA91531003F314A /* ReactKit.xcodeproj */; + ProductGroup = 14AADF001AC3DB95002390C9 /* Products */; + ProjectRef = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */; }, ); projectRoot = ""; @@ -464,13 +464,6 @@ remoteRef = 13417FEE1AA914B8003F314A /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 13417FFF1AA91531003F314A /* libReactKit.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libReactKit.a; - remoteRef = 13417FFE1AA91531003F314A /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 1341802B1AA91779003F314A /* libRCTNetwork.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -499,6 +492,13 @@ remoteRef = 147CED4A1AB34F8C00DA3E4C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 14AADF041AC3DB95002390C9 /* libReact.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libReact.a; + remoteRef = 14AADF031AC3DB95002390C9 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 14DC67F11AB71876001358AB /* libRCTPushNotification.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -595,6 +595,11 @@ "FB_REFERENCE_IMAGE_DIR=\"\\\"$(SOURCE_ROOT)/$(PROJECT_NAME)Tests/ReferenceImages\\\"\"", "$(inherited)", ); + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../../React/**", + ); INFOPLIST_FILE = UIExplorerTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -611,6 +616,11 @@ "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", ); + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../../React/**", + ); INFOPLIST_FILE = UIExplorerTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -622,11 +632,12 @@ 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); INFOPLIST_FILE = "$(SRCROOT)/UIExplorer/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -639,11 +650,12 @@ 13B07F951A680F5B00A75B9A /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); INFOPLIST_FILE = "$(SRCROOT)/UIExplorer/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -690,7 +702,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = YES; @@ -730,7 +742,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = NO; diff --git a/IntegrationTests/IntegrationTests.xcodeproj/project.pbxproj b/IntegrationTests/IntegrationTests.xcodeproj/project.pbxproj index 3c64d8f3d..6ae4db06c 100644 --- a/IntegrationTests/IntegrationTests.xcodeproj/project.pbxproj +++ b/IntegrationTests/IntegrationTests.xcodeproj/project.pbxproj @@ -12,7 +12,7 @@ 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; - 580C37601AB0F6180015E709 /* libReactKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 580C37461AB0F5320015E709 /* libReactKit.a */; }; + 1405E9C21AC3E65600F5BC37 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1405E9C11AC3E63C00F5BC37 /* libReact.a */; }; 580C37611AB0F61E0015E709 /* libRCTAdSupport.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 580C374B1AB0F54A0015E709 /* libRCTAdSupport.a */; }; 580C37621AB0F6260015E709 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 580C37501AB0F55C0015E709 /* libRCTGeolocation.a */; }; 580C37631AB0F62C0015E709 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 580C37551AB0F56E0015E709 /* libRCTImage.a */; }; @@ -22,6 +22,13 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 1405E9C01AC3E63C00F5BC37 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1405E9BC1AC3E63C00F5BC37 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; + remoteInfo = React; + }; 58005BCB1ABA44F10062E044 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; @@ -29,13 +36,6 @@ remoteGlobalIDString = 13B07F861A680F5B00A75B9A; remoteInfo = IntegrationTests; }; - 580C37451AB0F5320015E709 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 13417FFA1AA91531003F314A /* ReactKit.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; - remoteInfo = ReactKit; - }; 580C374A1AB0F54A0015E709 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 134454551AAFCAAE003F0779 /* RCTAdSupport.xcodeproj */; @@ -86,7 +86,6 @@ 004D28A21AAF61C70097A701 /* IntegrationTestsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IntegrationTestsTests.m; sourceTree = ""; }; 13417FE31AA91428003F314A /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = ../Libraries/Image/RCTImage.xcodeproj; sourceTree = ""; }; 13417FEA1AA914B8003F314A /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../Libraries/Text/RCTText.xcodeproj; sourceTree = ""; }; - 13417FFA1AA91531003F314A /* ReactKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactKit.xcodeproj; path = ../ReactKit/ReactKit.xcodeproj; sourceTree = ""; }; 134180261AA91779003F314A /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = ../Libraries/Network/RCTNetwork.xcodeproj; sourceTree = ""; }; 134454551AAFCAAE003F0779 /* RCTAdSupport.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAdSupport.xcodeproj; path = ../Libraries/AdSupport/RCTAdSupport.xcodeproj; sourceTree = ""; }; 134A8A201AACED6A00945AAE /* RCTGeolocation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTGeolocation.xcodeproj; path = ../Libraries/GeoLocation/RCTGeolocation.xcodeproj; sourceTree = ""; }; @@ -97,6 +96,7 @@ 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 1405E9BC1AC3E63C00F5BC37 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../React/React.xcodeproj; sourceTree = ""; }; 580C37891AB104AF0015E709 /* RCTTest.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTTest.xcodeproj; path = ../Libraries/RCTTest/RCTTest.xcodeproj; sourceTree = ""; }; /* End PBXFileReference section */ @@ -112,7 +112,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 580C37601AB0F6180015E709 /* libReactKit.a in Frameworks */, + 1405E9C21AC3E65600F5BC37 /* libReact.a in Frameworks */, 580C37611AB0F61E0015E709 /* libRCTAdSupport.a in Frameworks */, 580C37621AB0F6260015E709 /* libRCTGeolocation.a in Frameworks */, 580C37631AB0F62C0015E709 /* libRCTImage.a in Frameworks */, @@ -145,7 +145,7 @@ 1316A21D1AA397F400C0188E /* Libraries */ = { isa = PBXGroup; children = ( - 13417FFA1AA91531003F314A /* ReactKit.xcodeproj */, + 1405E9BC1AC3E63C00F5BC37 /* React.xcodeproj */, 134454551AAFCAAE003F0779 /* RCTAdSupport.xcodeproj */, 134A8A201AACED6A00945AAE /* RCTGeolocation.xcodeproj */, 13417FE31AA91428003F314A /* RCTImage.xcodeproj */, @@ -169,10 +169,10 @@ name = IntegrationTests; sourceTree = ""; }; - 580C37421AB0F5320015E709 /* Products */ = { + 1405E9BD1AC3E63C00F5BC37 /* Products */ = { isa = PBXGroup; children = ( - 580C37461AB0F5320015E709 /* libReactKit.a */, + 1405E9C11AC3E63C00F5BC37 /* libReact.a */, ); name = Products; sourceTree = ""; @@ -334,8 +334,8 @@ ProjectRef = 13417FEA1AA914B8003F314A /* RCTText.xcodeproj */; }, { - ProductGroup = 580C37421AB0F5320015E709 /* Products */; - ProjectRef = 13417FFA1AA91531003F314A /* ReactKit.xcodeproj */; + ProductGroup = 1405E9BD1AC3E63C00F5BC37 /* Products */; + ProjectRef = 1405E9BC1AC3E63C00F5BC37 /* React.xcodeproj */; }, ); projectRoot = ""; @@ -347,11 +347,11 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 580C37461AB0F5320015E709 /* libReactKit.a */ = { + 1405E9C11AC3E63C00F5BC37 /* libReact.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libReactKit.a; - remoteRef = 580C37451AB0F5320015E709 /* PBXContainerItemProxy */; + path = libReact.a; + remoteRef = 1405E9C01AC3E63C00F5BC37 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; 580C374B1AB0F54A0015E709 /* libRCTAdSupport.a */ = { @@ -471,6 +471,11 @@ "FB_REFERENCE_IMAGE_DIR=\"\\\"$(SOURCE_ROOT)/$(PROJECT_NAME)Tests/ReferenceImages\\\"\"", "$(inherited)", ); + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../React/**", + ); INFOPLIST_FILE = IntegrationTestsTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -488,6 +493,11 @@ "$(SDKROOT)/Developer/Library/Frameworks", "$(DEVELOPER_FRAMEWORKS_DIR)", ); + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../React/**", + ); INFOPLIST_FILE = IntegrationTestsTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -503,7 +513,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../React/**", ); INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -520,7 +530,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../React/**", ); INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -567,7 +577,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../ReactKit/**", + "$(SRCROOT)/../React/**", ); IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = YES; @@ -607,7 +617,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../ReactKit/**", + "$(SRCROOT)/../React/**", ); IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = NO; diff --git a/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj/project.pbxproj b/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj/project.pbxproj index 4b05e5f43..1e32363c4 100644 --- a/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj/project.pbxproj +++ b/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj/project.pbxproj @@ -199,7 +199,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; @@ -214,7 +214,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; diff --git a/Libraries/AdSupport/RCTAdSupport.xcodeproj/project.pbxproj b/Libraries/AdSupport/RCTAdSupport.xcodeproj/project.pbxproj index dc1f0393b..d48bec56c 100644 --- a/Libraries/AdSupport/RCTAdSupport.xcodeproj/project.pbxproj +++ b/Libraries/AdSupport/RCTAdSupport.xcodeproj/project.pbxproj @@ -155,7 +155,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = YES; @@ -194,7 +194,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = NO; @@ -206,6 +206,11 @@ 832C81951AAF6DF0007FA2F7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../../React/**", + ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -215,6 +220,11 @@ 832C81961AAF6DF0007FA2F7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../../React/**", + ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; diff --git a/Libraries/Animation/RCTAnimation.xcodeproj/project.pbxproj b/Libraries/Animation/RCTAnimation.xcodeproj/project.pbxproj index 36b95fba1..81eb52c70 100644 --- a/Libraries/Animation/RCTAnimation.xcodeproj/project.pbxproj +++ b/Libraries/Animation/RCTAnimation.xcodeproj/project.pbxproj @@ -199,12 +199,9 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", - ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "/Users/nicklockwood/fbobjc-hg/Libraries/FBReactKit/js/react-native-github/ReactKit/build/Debug-iphoneos", + "$(SRCROOT)/../../React/**", ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = RCTAnimation; SKIP_INSTALL = YES; @@ -217,12 +214,9 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", - ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "/Users/nicklockwood/fbobjc-hg/Libraries/FBReactKit/js/react-native-github/ReactKit/build/Debug-iphoneos", + "$(SRCROOT)/../../React/**", ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = RCTAnimation; SKIP_INSTALL = YES; diff --git a/Libraries/Geolocation/RCTGeolocation.xcodeproj/project.pbxproj b/Libraries/Geolocation/RCTGeolocation.xcodeproj/project.pbxproj index 96545a34c..f0c5c2903 100644 --- a/Libraries/Geolocation/RCTGeolocation.xcodeproj/project.pbxproj +++ b/Libraries/Geolocation/RCTGeolocation.xcodeproj/project.pbxproj @@ -199,12 +199,9 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", - ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "/Users/nicklockwood/fbobjc-hg/Libraries/FBReactKit/js/react-native-github/ReactKit/build/Debug-iphoneos", + "$(SRCROOT)/../../React/**", ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = RCTGeolocation; SKIP_INSTALL = YES; @@ -217,12 +214,9 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", - ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "/Users/nicklockwood/fbobjc-hg/Libraries/FBReactKit/js/react-native-github/ReactKit/build/Debug-iphoneos", + "$(SRCROOT)/../../React/**", ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = RCTGeolocation; SKIP_INSTALL = YES; diff --git a/Libraries/Image/RCTImage.xcodeproj/project.pbxproj b/Libraries/Image/RCTImage.xcodeproj/project.pbxproj index fa6c8c084..585bd408b 100644 --- a/Libraries/Image/RCTImage.xcodeproj/project.pbxproj +++ b/Libraries/Image/RCTImage.xcodeproj/project.pbxproj @@ -241,7 +241,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -259,7 +259,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", diff --git a/Libraries/LinkingIOS/RCTLinking.xcodeproj/project.pbxproj b/Libraries/LinkingIOS/RCTLinking.xcodeproj/project.pbxproj index 0d9e593d2..a9a8f3f42 100644 --- a/Libraries/LinkingIOS/RCTLinking.xcodeproj/project.pbxproj +++ b/Libraries/LinkingIOS/RCTLinking.xcodeproj/project.pbxproj @@ -199,12 +199,9 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", - ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "/Users/nicklockwood/fbobjc-hg/Libraries/FBReactKit/js/react-native-github/ReactKit/build/Debug-iphoneos", + "$(SRCROOT)/../../React/**", ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = RCTLinking; SKIP_INSTALL = YES; @@ -217,12 +214,9 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", - ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "/Users/nicklockwood/fbobjc-hg/Libraries/FBReactKit/js/react-native-github/ReactKit/build/Debug-iphoneos", + "$(SRCROOT)/../../React/**", ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = RCTLinking; SKIP_INSTALL = YES; diff --git a/Libraries/Network/RCTNetwork.xcodeproj/project.pbxproj b/Libraries/Network/RCTNetwork.xcodeproj/project.pbxproj index f2f3f6a33..9aa64ad23 100644 --- a/Libraries/Network/RCTNetwork.xcodeproj/project.pbxproj +++ b/Libraries/Network/RCTNetwork.xcodeproj/project.pbxproj @@ -205,12 +205,9 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", - ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "/Users/nicklockwood/fbobjc-hg/Libraries/FBReactKit/js/react-native-github/ReactKit/build/Debug-iphoneos", + "$(SRCROOT)/../../React/**", ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = RCTNetwork; SKIP_INSTALL = YES; @@ -223,12 +220,9 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", - ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "/Users/nicklockwood/fbobjc-hg/Libraries/FBReactKit/js/react-native-github/ReactKit/build/Debug-iphoneos", + "$(SRCROOT)/../../React/**", ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = RCTNetwork; SKIP_INSTALL = YES; diff --git a/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj/project.pbxproj b/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj/project.pbxproj index 507f47aa0..9521a4dfc 100644 --- a/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj/project.pbxproj +++ b/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj/project.pbxproj @@ -199,12 +199,9 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", - ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "/Users/nicklockwood/fbobjc-hg/Libraries/FBReactKit/js/react-native-github/ReactKit/build/Debug-iphoneos", + "$(SRCROOT)/../../React/**", ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = RCTPushNotification; SKIP_INSTALL = YES; @@ -217,12 +214,9 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", - ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "/Users/nicklockwood/fbobjc-hg/Libraries/FBReactKit/js/react-native-github/ReactKit/build/Debug-iphoneos", + "$(SRCROOT)/../../React/**", ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = RCTPushNotification; SKIP_INSTALL = YES; diff --git a/Libraries/RCTTest/RCTTest.xcodeproj/project.pbxproj b/Libraries/RCTTest/RCTTest.xcodeproj/project.pbxproj index bb4457b1f..a710b09e9 100644 --- a/Libraries/RCTTest/RCTTest.xcodeproj/project.pbxproj +++ b/Libraries/RCTTest/RCTTest.xcodeproj/project.pbxproj @@ -193,7 +193,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); IPHONEOS_DEPLOYMENT_TARGET = 8.1; MTL_ENABLE_DEBUG_INFO = YES; @@ -232,7 +232,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); IPHONEOS_DEPLOYMENT_TARGET = 8.1; MTL_ENABLE_DEBUG_INFO = NO; @@ -244,6 +244,11 @@ 580C37841AB104AF0015E709 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../../React/**", + ); OTHER_LDFLAGS = ( "-ObjC", "-framework", @@ -257,6 +262,11 @@ 580C37851AB104AF0015E709 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../../React/**", + ); OTHER_LDFLAGS = ( "-ObjC", "-framework", diff --git a/Libraries/RCTWebSocketDebugger/RCTWebSocketDebugger.xcodeproj/project.pbxproj b/Libraries/RCTWebSocketDebugger/RCTWebSocketDebugger.xcodeproj/project.pbxproj index 07d24eb36..082ba27b2 100644 --- a/Libraries/RCTWebSocketDebugger/RCTWebSocketDebugger.xcodeproj/project.pbxproj +++ b/Libraries/RCTWebSocketDebugger/RCTWebSocketDebugger.xcodeproj/project.pbxproj @@ -161,7 +161,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); IPHONEOS_DEPLOYMENT_TARGET = 8.2; MTL_ENABLE_DEBUG_INFO = YES; @@ -200,7 +200,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); IPHONEOS_DEPLOYMENT_TARGET = 8.2; MTL_ENABLE_DEBUG_INFO = NO; @@ -212,6 +212,11 @@ 832C81951AAF6DF0007FA2F7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../../React/**", + ); OTHER_LDFLAGS = ( "-ObjC", "-llibicucore", @@ -224,6 +229,11 @@ 832C81961AAF6DF0007FA2F7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../../React/**", + ); OTHER_LDFLAGS = ( "-ObjC", "-llibicucore", diff --git a/Libraries/Text/RCTText.m b/Libraries/Text/RCTText.m index e5af69be8..457079bcb 100644 --- a/Libraries/Text/RCTText.m +++ b/Libraries/Text/RCTText.m @@ -11,7 +11,7 @@ #import "RCTShadowText.h" #import "RCTUtils.h" -#import "UIView+ReactKit.h" +#import "UIView+React.h" @implementation RCTText { diff --git a/Libraries/Text/RCTText.xcodeproj/project.pbxproj b/Libraries/Text/RCTText.xcodeproj/project.pbxproj index 22eafac25..7f34de484 100644 --- a/Libraries/Text/RCTText.xcodeproj/project.pbxproj +++ b/Libraries/Text/RCTText.xcodeproj/project.pbxproj @@ -223,7 +223,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -237,7 +237,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/Libraries/Text/RCTTextManager.m b/Libraries/Text/RCTTextManager.m index e18b8987e..70cbd9ab5 100644 --- a/Libraries/Text/RCTTextManager.m +++ b/Libraries/Text/RCTTextManager.m @@ -16,7 +16,7 @@ #import "RCTShadowText.h" #import "RCTSparseArray.h" #import "RCTText.h" -#import "UIView+ReactKit.h" +#import "UIView+React.h" @implementation RCTTextManager diff --git a/Libraries/Vibration/RCTVibration.xcodeproj/project.pbxproj b/Libraries/Vibration/RCTVibration.xcodeproj/project.pbxproj index 8de930901..c8d628bbe 100644 --- a/Libraries/Vibration/RCTVibration.xcodeproj/project.pbxproj +++ b/Libraries/Vibration/RCTVibration.xcodeproj/project.pbxproj @@ -155,7 +155,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = YES; @@ -194,7 +194,7 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, - "$(SRCROOT)/../../ReactKit/**", + "$(SRCROOT)/../../React/**", ); IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = NO; @@ -206,6 +206,11 @@ 832C81951AAF6DF0007FA2F7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../../React/**", + ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -215,6 +220,11 @@ 832C81961AAF6DF0007FA2F7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + "$(inherited)", + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, + "$(SRCROOT)/../../React/**", + ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; diff --git a/React.podspec b/React.podspec index 102051998..e8403caab 100644 --- a/React.podspec +++ b/React.podspec @@ -18,7 +18,7 @@ Pod::Spec.new do |s| s.author = "Facebook" s.platform = :ios, "7.0" s.source = { :git => "https://github.com/facebook/react-native.git", :tag => "v#{s.version}" } - s.source_files = "ReactKit/**/*.{c,h,m}" + s.source_files = "React/**/*.{c,h,m}" s.resources = "Resources/*.png" s.preserve_paths = "cli.js", "Libraries/**/*.js", "lint", "linter.js", "node_modules", "package.json", "packager", "PATENTS", "react-native-cli" s.exclude_files = "**/__tests__/*", "IntegrationTests/*" diff --git a/ReactKit/Base/RCTAssert.h b/React/Base/RCTAssert.h similarity index 100% rename from ReactKit/Base/RCTAssert.h rename to React/Base/RCTAssert.h diff --git a/ReactKit/Base/RCTAssert.m b/React/Base/RCTAssert.m similarity index 100% rename from ReactKit/Base/RCTAssert.m rename to React/Base/RCTAssert.m diff --git a/ReactKit/Base/RCTBridge.h b/React/Base/RCTBridge.h similarity index 100% rename from ReactKit/Base/RCTBridge.h rename to React/Base/RCTBridge.h diff --git a/ReactKit/Base/RCTBridge.m b/React/Base/RCTBridge.m similarity index 99% rename from ReactKit/Base/RCTBridge.m rename to React/Base/RCTBridge.m index fe13a1bfd..8a81a2327 100644 --- a/ReactKit/Base/RCTBridge.m +++ b/React/Base/RCTBridge.m @@ -508,7 +508,7 @@ static id _latestJSExecutor; { if ((self = [super init])) { _eventDispatcher = [[RCTEventDispatcher alloc] initWithBridge:self]; - _shadowQueue = dispatch_queue_create("com.facebook.ReactKit.ShadowQueue", DISPATCH_QUEUE_SERIAL); + _shadowQueue = dispatch_queue_create("com.facebook.React.ShadowQueue", DISPATCH_QUEUE_SERIAL); _moduleProvider = block; _launchOptions = launchOptions; } diff --git a/ReactKit/Base/RCTBridgeModule.h b/React/Base/RCTBridgeModule.h similarity index 100% rename from ReactKit/Base/RCTBridgeModule.h rename to React/Base/RCTBridgeModule.h diff --git a/ReactKit/Base/RCTCache.h b/React/Base/RCTCache.h similarity index 100% rename from ReactKit/Base/RCTCache.h rename to React/Base/RCTCache.h diff --git a/ReactKit/Base/RCTCache.m b/React/Base/RCTCache.m similarity index 97% rename from ReactKit/Base/RCTCache.m rename to React/Base/RCTCache.m index efc68ae37..6297771d2 100644 --- a/ReactKit/Base/RCTCache.m +++ b/React/Base/RCTCache.m @@ -12,8 +12,8 @@ #import #import -static NSString *const RCTCacheSubdirectoryName = @"ReactKit"; -static NSString *const RCTKeyExtendedAttributeName = @"com.facebook.ReactKit.RCTCacheManager.Key"; +static NSString *const RCTCacheSubdirectoryName = @"React"; +static NSString *const RCTKeyExtendedAttributeName = @"com.facebook.React.RCTCacheManager.Key"; static NSMapTable *RCTLivingCachesByName; static NSError *RCTPOSIXError(int errorNumber) @@ -88,7 +88,7 @@ static BOOL RCTSetExtendedAttribute(NSURL *fileURL, NSString *key, NSString *val { dispatch_queue_t queue = _queue; if (!queue) { - NSString *queueName = [NSString stringWithFormat:@"com.facebook.ReactKit.RCTCache.%@", _UUID.UUIDString]; + NSString *queueName = [NSString stringWithFormat:@"com.facebook.React.RCTCache.%@", _UUID.UUIDString]; queue = dispatch_queue_create(queueName.UTF8String, DISPATCH_QUEUE_SERIAL); _queue = queue; } diff --git a/ReactKit/Base/RCTConvert.h b/React/Base/RCTConvert.h similarity index 100% rename from ReactKit/Base/RCTConvert.h rename to React/Base/RCTConvert.h diff --git a/ReactKit/Base/RCTConvert.m b/React/Base/RCTConvert.m similarity index 99% rename from ReactKit/Base/RCTConvert.m rename to React/Base/RCTConvert.m index b502214d1..9bf7104c9 100644 --- a/ReactKit/Base/RCTConvert.m +++ b/React/Base/RCTConvert.m @@ -458,7 +458,7 @@ RCT_CGSTRUCT_CONVERTER(CGAffineTransform, (@[ // These constants are defined in iPhone SDK 8.2 // They'll work fine in earlier iOS versions, but the app cannot be built with // an SDK version < 8.2 unless we redefine them here. This will be removed -// in a future version of ReactKit, once 8.2 is more widely adopted. +// in a future version of React, once 8.2 is more widely adopted. static const CGFloat UIFontWeightUltraLight = -0.8; static const CGFloat UIFontWeightThin = -0.6; diff --git a/ReactKit/Base/RCTDevMenu.h b/React/Base/RCTDevMenu.h similarity index 100% rename from ReactKit/Base/RCTDevMenu.h rename to React/Base/RCTDevMenu.h diff --git a/ReactKit/Base/RCTDevMenu.m b/React/Base/RCTDevMenu.m similarity index 100% rename from ReactKit/Base/RCTDevMenu.m rename to React/Base/RCTDevMenu.m diff --git a/ReactKit/Base/RCTEventDispatcher.h b/React/Base/RCTEventDispatcher.h similarity index 100% rename from ReactKit/Base/RCTEventDispatcher.h rename to React/Base/RCTEventDispatcher.h diff --git a/ReactKit/Base/RCTEventDispatcher.m b/React/Base/RCTEventDispatcher.m similarity index 100% rename from ReactKit/Base/RCTEventDispatcher.m rename to React/Base/RCTEventDispatcher.m diff --git a/ReactKit/Base/RCTInvalidating.h b/React/Base/RCTInvalidating.h similarity index 100% rename from ReactKit/Base/RCTInvalidating.h rename to React/Base/RCTInvalidating.h diff --git a/ReactKit/Base/RCTJSMethodRegistrar.h b/React/Base/RCTJSMethodRegistrar.h similarity index 100% rename from ReactKit/Base/RCTJSMethodRegistrar.h rename to React/Base/RCTJSMethodRegistrar.h diff --git a/ReactKit/Base/RCTJavaScriptExecutor.h b/React/Base/RCTJavaScriptExecutor.h similarity index 100% rename from ReactKit/Base/RCTJavaScriptExecutor.h rename to React/Base/RCTJavaScriptExecutor.h diff --git a/ReactKit/Base/RCTKeyCommands.h b/React/Base/RCTKeyCommands.h similarity index 100% rename from ReactKit/Base/RCTKeyCommands.h rename to React/Base/RCTKeyCommands.h diff --git a/ReactKit/Base/RCTKeyCommands.m b/React/Base/RCTKeyCommands.m similarity index 100% rename from ReactKit/Base/RCTKeyCommands.m rename to React/Base/RCTKeyCommands.m diff --git a/ReactKit/Base/RCTLog.h b/React/Base/RCTLog.h similarity index 100% rename from ReactKit/Base/RCTLog.h rename to React/Base/RCTLog.h diff --git a/ReactKit/Base/RCTLog.m b/React/Base/RCTLog.m similarity index 100% rename from ReactKit/Base/RCTLog.m rename to React/Base/RCTLog.m diff --git a/ReactKit/Base/RCTRedBox.h b/React/Base/RCTRedBox.h similarity index 100% rename from ReactKit/Base/RCTRedBox.h rename to React/Base/RCTRedBox.h diff --git a/ReactKit/Base/RCTRedBox.m b/React/Base/RCTRedBox.m similarity index 100% rename from ReactKit/Base/RCTRedBox.m rename to React/Base/RCTRedBox.m diff --git a/ReactKit/Base/RCTRootView.h b/React/Base/RCTRootView.h similarity index 100% rename from ReactKit/Base/RCTRootView.h rename to React/Base/RCTRootView.h diff --git a/ReactKit/Base/RCTRootView.m b/React/Base/RCTRootView.m similarity index 99% rename from ReactKit/Base/RCTRootView.m rename to React/Base/RCTRootView.m index 7f60598c3..ac39a9aed 100644 --- a/ReactKit/Base/RCTRootView.m +++ b/React/Base/RCTRootView.m @@ -21,7 +21,7 @@ #import "RCTUIManager.h" #import "RCTUtils.h" #import "RCTWebViewExecutor.h" -#import "UIView+ReactKit.h" +#import "UIView+React.h" NSString *const RCTReloadNotification = @"RCTReloadNotification"; @@ -244,7 +244,7 @@ static Class _globalExecutorClass; if (error) { if ([[error domain] isEqualToString:NSURLErrorDomain]) { NSDictionary *userInfo = @{ - NSLocalizedDescriptionKey: @"Could not connect to development server. Ensure node server is running - run 'npm start' from ReactKit root", + NSLocalizedDescriptionKey: @"Could not connect to development server. Ensure node server is running - run 'npm start' from React root", NSLocalizedFailureReasonErrorKey: [error localizedDescription], NSUnderlyingErrorKey: error, }; diff --git a/ReactKit/Base/RCTSparseArray.h b/React/Base/RCTSparseArray.h similarity index 100% rename from ReactKit/Base/RCTSparseArray.h rename to React/Base/RCTSparseArray.h diff --git a/ReactKit/Base/RCTSparseArray.m b/React/Base/RCTSparseArray.m similarity index 100% rename from ReactKit/Base/RCTSparseArray.m rename to React/Base/RCTSparseArray.m diff --git a/ReactKit/Base/RCTTouchHandler.h b/React/Base/RCTTouchHandler.h similarity index 100% rename from ReactKit/Base/RCTTouchHandler.h rename to React/Base/RCTTouchHandler.h diff --git a/ReactKit/Base/RCTTouchHandler.m b/React/Base/RCTTouchHandler.m similarity index 99% rename from ReactKit/Base/RCTTouchHandler.m rename to React/Base/RCTTouchHandler.m index 108e43cce..b5d3b1e72 100644 --- a/ReactKit/Base/RCTTouchHandler.m +++ b/React/Base/RCTTouchHandler.m @@ -16,7 +16,7 @@ #import "RCTLog.h" #import "RCTUIManager.h" #import "RCTUtils.h" -#import "UIView+ReactKit.h" +#import "UIView+React.h" // TODO: this class behaves a lot like a module, and could be implemented as a // module if we were to assume that modules and RootViews had a 1:1 relationship diff --git a/ReactKit/Base/RCTUtils.h b/React/Base/RCTUtils.h similarity index 100% rename from ReactKit/Base/RCTUtils.h rename to React/Base/RCTUtils.h diff --git a/ReactKit/Base/RCTUtils.m b/React/Base/RCTUtils.m similarity index 100% rename from ReactKit/Base/RCTUtils.m rename to React/Base/RCTUtils.m diff --git a/ReactKit/Executors/RCTContextExecutor.h b/React/Executors/RCTContextExecutor.h similarity index 100% rename from ReactKit/Executors/RCTContextExecutor.h rename to React/Executors/RCTContextExecutor.h diff --git a/ReactKit/Executors/RCTContextExecutor.m b/React/Executors/RCTContextExecutor.m similarity index 99% rename from ReactKit/Executors/RCTContextExecutor.m rename to React/Executors/RCTContextExecutor.m index e13f296e7..4370bd7bd 100644 --- a/ReactKit/Executors/RCTContextExecutor.m +++ b/React/Executors/RCTContextExecutor.m @@ -121,7 +121,7 @@ static NSError *RCTNSErrorFromJSError(JSContextRef context, JSValueRef jsError) dispatch_once(&onceToken, ^{ // All JS is single threaded, so a serial queue is our only option. javaScriptThread = [[NSThread alloc] initWithTarget:[self class] selector:@selector(runRunLoopThread) object:nil]; - [javaScriptThread setName:@"com.facebook.ReactKit.JavaScript"]; + [javaScriptThread setName:@"com.facebook.React.JavaScript"]; [javaScriptThread setThreadPriority:[[NSThread mainThread] threadPriority]]; [javaScriptThread start]; }); diff --git a/ReactKit/Executors/RCTWebViewExecutor.h b/React/Executors/RCTWebViewExecutor.h similarity index 100% rename from ReactKit/Executors/RCTWebViewExecutor.h rename to React/Executors/RCTWebViewExecutor.h diff --git a/ReactKit/Executors/RCTWebViewExecutor.m b/React/Executors/RCTWebViewExecutor.m similarity index 100% rename from ReactKit/Executors/RCTWebViewExecutor.m rename to React/Executors/RCTWebViewExecutor.m diff --git a/ReactKit/Layout/Layout.c b/React/Layout/Layout.c similarity index 100% rename from ReactKit/Layout/Layout.c rename to React/Layout/Layout.c diff --git a/ReactKit/Layout/Layout.h b/React/Layout/Layout.h similarity index 100% rename from ReactKit/Layout/Layout.h rename to React/Layout/Layout.h diff --git a/ReactKit/Modules/RCTAlertManager.h b/React/Modules/RCTAlertManager.h similarity index 100% rename from ReactKit/Modules/RCTAlertManager.h rename to React/Modules/RCTAlertManager.h diff --git a/ReactKit/Modules/RCTAlertManager.m b/React/Modules/RCTAlertManager.m similarity index 100% rename from ReactKit/Modules/RCTAlertManager.m rename to React/Modules/RCTAlertManager.m diff --git a/ReactKit/Modules/RCTAppState.h b/React/Modules/RCTAppState.h similarity index 100% rename from ReactKit/Modules/RCTAppState.h rename to React/Modules/RCTAppState.h diff --git a/ReactKit/Modules/RCTAppState.m b/React/Modules/RCTAppState.m similarity index 100% rename from ReactKit/Modules/RCTAppState.m rename to React/Modules/RCTAppState.m diff --git a/ReactKit/Modules/RCTAsyncLocalStorage.h b/React/Modules/RCTAsyncLocalStorage.h similarity index 100% rename from ReactKit/Modules/RCTAsyncLocalStorage.h rename to React/Modules/RCTAsyncLocalStorage.h diff --git a/ReactKit/Modules/RCTAsyncLocalStorage.m b/React/Modules/RCTAsyncLocalStorage.m similarity index 100% rename from ReactKit/Modules/RCTAsyncLocalStorage.m rename to React/Modules/RCTAsyncLocalStorage.m diff --git a/ReactKit/Modules/RCTExceptionsManager.h b/React/Modules/RCTExceptionsManager.h similarity index 100% rename from ReactKit/Modules/RCTExceptionsManager.h rename to React/Modules/RCTExceptionsManager.h diff --git a/ReactKit/Modules/RCTExceptionsManager.m b/React/Modules/RCTExceptionsManager.m similarity index 100% rename from ReactKit/Modules/RCTExceptionsManager.m rename to React/Modules/RCTExceptionsManager.m diff --git a/ReactKit/Modules/RCTSourceCode.h b/React/Modules/RCTSourceCode.h similarity index 100% rename from ReactKit/Modules/RCTSourceCode.h rename to React/Modules/RCTSourceCode.h diff --git a/ReactKit/Modules/RCTSourceCode.m b/React/Modules/RCTSourceCode.m similarity index 100% rename from ReactKit/Modules/RCTSourceCode.m rename to React/Modules/RCTSourceCode.m diff --git a/ReactKit/Modules/RCTStatusBarManager.h b/React/Modules/RCTStatusBarManager.h similarity index 100% rename from ReactKit/Modules/RCTStatusBarManager.h rename to React/Modules/RCTStatusBarManager.h diff --git a/ReactKit/Modules/RCTStatusBarManager.m b/React/Modules/RCTStatusBarManager.m similarity index 100% rename from ReactKit/Modules/RCTStatusBarManager.m rename to React/Modules/RCTStatusBarManager.m diff --git a/ReactKit/Modules/RCTTiming.h b/React/Modules/RCTTiming.h similarity index 100% rename from ReactKit/Modules/RCTTiming.h rename to React/Modules/RCTTiming.h diff --git a/ReactKit/Modules/RCTTiming.m b/React/Modules/RCTTiming.m similarity index 100% rename from ReactKit/Modules/RCTTiming.m rename to React/Modules/RCTTiming.m diff --git a/ReactKit/Modules/RCTUIManager.h b/React/Modules/RCTUIManager.h similarity index 100% rename from ReactKit/Modules/RCTUIManager.h rename to React/Modules/RCTUIManager.h diff --git a/ReactKit/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m similarity index 99% rename from ReactKit/Modules/RCTUIManager.m rename to React/Modules/RCTUIManager.m index d8645d612..e6a540db2 100644 --- a/ReactKit/Modules/RCTUIManager.m +++ b/React/Modules/RCTUIManager.m @@ -27,7 +27,7 @@ #import "RCTView.h" #import "RCTViewManager.h" #import "RCTViewNodeProtocol.h" -#import "UIView+ReactKit.h" +#import "UIView+React.h" typedef void (^react_view_node_block_t)(id); diff --git a/ReactKit/ReactKit.xcodeproj/project.pbxproj b/React/React.xcodeproj/project.pbxproj similarity index 97% rename from ReactKit/ReactKit.xcodeproj/project.pbxproj rename to React/React.xcodeproj/project.pbxproj index b7c68ccd5..ba6ec3aab 100644 --- a/ReactKit/ReactKit.xcodeproj/project.pbxproj +++ b/React/React.xcodeproj/project.pbxproj @@ -38,7 +38,7 @@ 13E067551A70F44B002CDEE1 /* RCTShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E0674C1A70F44B002CDEE1 /* RCTShadowView.m */; }; 13E067561A70F44B002CDEE1 /* RCTViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E0674E1A70F44B002CDEE1 /* RCTViewManager.m */; }; 13E067571A70F44B002CDEE1 /* RCTView.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E067501A70F44B002CDEE1 /* RCTView.m */; }; - 13E067591A70F44B002CDEE1 /* UIView+ReactKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E067541A70F44B002CDEE1 /* UIView+ReactKit.m */; }; + 13E067591A70F44B002CDEE1 /* UIView+React.m in Sources */ = {isa = PBXBuildFile; fileRef = 13E067541A70F44B002CDEE1 /* UIView+React.m */; }; 14435CE51AAC4AE100FC20F4 /* RCTMap.m in Sources */ = {isa = PBXBuildFile; fileRef = 14435CE21AAC4AE100FC20F4 /* RCTMap.m */; }; 14435CE61AAC4AE100FC20F4 /* RCTMapManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 14435CE41AAC4AE100FC20F4 /* RCTMapManager.m */; }; 14F3620D1AABD06A001CE568 /* RCTSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = 14F362081AABD06A001CE568 /* RCTSwitch.m */; }; @@ -143,8 +143,8 @@ 13E0674E1A70F44B002CDEE1 /* RCTViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTViewManager.m; sourceTree = ""; }; 13E0674F1A70F44B002CDEE1 /* RCTView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTView.h; sourceTree = ""; }; 13E067501A70F44B002CDEE1 /* RCTView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTView.m; sourceTree = ""; }; - 13E067531A70F44B002CDEE1 /* UIView+ReactKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+ReactKit.h"; sourceTree = ""; }; - 13E067541A70F44B002CDEE1 /* UIView+ReactKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+ReactKit.m"; sourceTree = ""; }; + 13E067531A70F44B002CDEE1 /* UIView+React.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+React.h"; sourceTree = ""; }; + 13E067541A70F44B002CDEE1 /* UIView+React.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+React.m"; sourceTree = ""; }; 13EFFCCF1A98E6FE002607DC /* RCTJSMethodRegistrar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJSMethodRegistrar.h; sourceTree = ""; }; 14435CE11AAC4AE100FC20F4 /* RCTMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTMap.h; sourceTree = ""; }; 14435CE21AAC4AE100FC20F4 /* RCTMap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTMap.m; sourceTree = ""; }; @@ -171,7 +171,7 @@ 830BA4541A8E3BDA00D53203 /* RCTCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTCache.m; sourceTree = ""; }; 83BEE46C1A6D19BC00B5863B /* RCTSparseArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTSparseArray.h; sourceTree = ""; }; 83BEE46D1A6D19BC00B5863B /* RCTSparseArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTSparseArray.m; sourceTree = ""; }; - 83CBBA2E1A601D0E00E9B192 /* libReactKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libReactKit.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 83CBBA2E1A601D0E00E9B192 /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; }; 83CBBA4A1A601E3B00E9B192 /* RCTAssert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTAssert.h; sourceTree = ""; }; 83CBBA4B1A601E3B00E9B192 /* RCTAssert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTAssert.m; sourceTree = ""; }; 83CBBA4C1A601E3B00E9B192 /* RCTInvalidating.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTInvalidating.h; sourceTree = ""; }; @@ -309,8 +309,8 @@ 13C156041AB1A2840079392D /* RCTWebViewManager.m */, 13B080231A694A8400A75B9A /* RCTWrapperViewController.h */, 13B080241A694A8400A75B9A /* RCTWrapperViewController.m */, - 13E067531A70F44B002CDEE1 /* UIView+ReactKit.h */, - 13E067541A70F44B002CDEE1 /* UIView+ReactKit.m */, + 13E067531A70F44B002CDEE1 /* UIView+React.h */, + 13E067541A70F44B002CDEE1 /* UIView+React.m */, ); path = Views; sourceTree = ""; @@ -318,7 +318,7 @@ 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( - 83CBBA2F1A601D0F00E9B192 /* ReactKit */, + 83CBBA2F1A601D0F00E9B192 /* React */, 83CBBA001A601CBA00E9B192 /* Products */, ); sourceTree = ""; @@ -326,12 +326,12 @@ 83CBBA001A601CBA00E9B192 /* Products */ = { isa = PBXGroup; children = ( - 83CBBA2E1A601D0E00E9B192 /* libReactKit.a */, + 83CBBA2E1A601D0E00E9B192 /* libReact.a */, ); name = Products; sourceTree = ""; }; - 83CBBA2F1A601D0F00E9B192 /* ReactKit */ = { + 83CBBA2F1A601D0F00E9B192 /* React */ = { isa = PBXGroup; children = ( 83CBBA491A601E3B00E9B192 /* Base */, @@ -340,7 +340,7 @@ 13B07FE01A69315300A75B9A /* Modules */, 13B07FF31A6947C200A75B9A /* Views */, ); - name = ReactKit; + name = React; sourceTree = ""; }; 83CBBA491A601E3B00E9B192 /* Base */ = { @@ -383,9 +383,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 83CBBA2D1A601D0E00E9B192 /* ReactKit */ = { + 83CBBA2D1A601D0E00E9B192 /* React */ = { isa = PBXNativeTarget; - buildConfigurationList = 83CBBA3F1A601D0F00E9B192 /* Build configuration list for PBXNativeTarget "ReactKit" */; + buildConfigurationList = 83CBBA3F1A601D0F00E9B192 /* Build configuration list for PBXNativeTarget "React" */; buildPhases = ( 006B79A01A781F38006873D1 /* ShellScript */, 83CBBA2A1A601D0E00E9B192 /* Sources */, @@ -396,9 +396,9 @@ ); dependencies = ( ); - name = ReactKit; - productName = ReactKit; - productReference = 83CBBA2E1A601D0E00E9B192 /* libReactKit.a */; + name = React; + productName = React; + productReference = 83CBBA2E1A601D0E00E9B192 /* libReact.a */; productType = "com.apple.product-type.library.static"; }; /* End PBXNativeTarget section */ @@ -415,7 +415,7 @@ }; }; }; - buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "ReactKit" */; + buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "React" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -428,7 +428,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 83CBBA2D1A601D0E00E9B192 /* ReactKit */, + 83CBBA2D1A601D0E00E9B192 /* React */, ); }; /* End PBXProject section */ @@ -478,7 +478,7 @@ 1372B70A1AB030C200659ED6 /* RCTAppState.m in Sources */, 13B0801F1A69489C00A75B9A /* RCTTextFieldManager.m in Sources */, 134FCB3D1A6E7F0800051CC8 /* RCTContextExecutor.m in Sources */, - 13E067591A70F44B002CDEE1 /* UIView+ReactKit.m in Sources */, + 13E067591A70F44B002CDEE1 /* UIView+React.m in Sources */, 14F484561AABFCE100FDF6B9 /* RCTSliderManager.m in Sources */, 83CBBA981A6020BB00E9B192 /* RCTTouchHandler.m in Sources */, 83CBBA521A601E3B00E9B192 /* RCTLog.m in Sources */, @@ -623,7 +623,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "ReactKit" */ = { + 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "React" */ = { isa = XCConfigurationList; buildConfigurations = ( 83CBBA201A601CBA00E9B192 /* Debug */, @@ -632,7 +632,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 83CBBA3F1A601D0F00E9B192 /* Build configuration list for PBXNativeTarget "ReactKit" */ = { + 83CBBA3F1A601D0F00E9B192 /* Build configuration list for PBXNativeTarget "React" */ = { isa = XCConfigurationList; buildConfigurations = ( 83CBBA401A601D0F00E9B192 /* Debug */, diff --git a/ReactKit/Views/RCTAnimationType.h b/React/Views/RCTAnimationType.h similarity index 100% rename from ReactKit/Views/RCTAnimationType.h rename to React/Views/RCTAnimationType.h diff --git a/ReactKit/Views/RCTAutoInsetsProtocol.h b/React/Views/RCTAutoInsetsProtocol.h similarity index 100% rename from ReactKit/Views/RCTAutoInsetsProtocol.h rename to React/Views/RCTAutoInsetsProtocol.h diff --git a/ReactKit/Views/RCTDatePickerManager.h b/React/Views/RCTDatePickerManager.h similarity index 100% rename from ReactKit/Views/RCTDatePickerManager.h rename to React/Views/RCTDatePickerManager.h diff --git a/ReactKit/Views/RCTDatePickerManager.m b/React/Views/RCTDatePickerManager.m similarity index 98% rename from ReactKit/Views/RCTDatePickerManager.m rename to React/Views/RCTDatePickerManager.m index 3fbeeefbb..4029998c2 100644 --- a/ReactKit/Views/RCTDatePickerManager.m +++ b/React/Views/RCTDatePickerManager.m @@ -12,7 +12,7 @@ #import "RCTBridge.h" #import "RCTConvert.h" #import "RCTEventDispatcher.h" -#import "UIView+ReactKit.h" +#import "UIView+React.h" @implementation RCTConvert(UIDatePicker) diff --git a/ReactKit/Views/RCTMap.h b/React/Views/RCTMap.h similarity index 100% rename from ReactKit/Views/RCTMap.h rename to React/Views/RCTMap.h diff --git a/ReactKit/Views/RCTMap.m b/React/Views/RCTMap.m similarity index 100% rename from ReactKit/Views/RCTMap.m rename to React/Views/RCTMap.m diff --git a/ReactKit/Views/RCTMapManager.h b/React/Views/RCTMapManager.h similarity index 100% rename from ReactKit/Views/RCTMapManager.h rename to React/Views/RCTMapManager.h diff --git a/ReactKit/Views/RCTMapManager.m b/React/Views/RCTMapManager.m similarity index 99% rename from ReactKit/Views/RCTMapManager.m rename to React/Views/RCTMapManager.m index a9c3a10f1..9bd0f7eab 100644 --- a/ReactKit/Views/RCTMapManager.m +++ b/React/Views/RCTMapManager.m @@ -12,7 +12,7 @@ #import "RCTBridge.h" #import "RCTEventDispatcher.h" #import "RCTMap.h" -#import "UIView+ReactKit.h" +#import "UIView+React.h" @implementation RCTConvert(CoreLocation) diff --git a/ReactKit/Views/RCTNavItem.h b/React/Views/RCTNavItem.h similarity index 100% rename from ReactKit/Views/RCTNavItem.h rename to React/Views/RCTNavItem.h diff --git a/ReactKit/Views/RCTNavItem.m b/React/Views/RCTNavItem.m similarity index 100% rename from ReactKit/Views/RCTNavItem.m rename to React/Views/RCTNavItem.m diff --git a/ReactKit/Views/RCTNavItemManager.h b/React/Views/RCTNavItemManager.h similarity index 100% rename from ReactKit/Views/RCTNavItemManager.h rename to React/Views/RCTNavItemManager.h diff --git a/ReactKit/Views/RCTNavItemManager.m b/React/Views/RCTNavItemManager.m similarity index 100% rename from ReactKit/Views/RCTNavItemManager.m rename to React/Views/RCTNavItemManager.m diff --git a/ReactKit/Views/RCTNavigator.h b/React/Views/RCTNavigator.h similarity index 100% rename from ReactKit/Views/RCTNavigator.h rename to React/Views/RCTNavigator.h diff --git a/ReactKit/Views/RCTNavigator.m b/React/Views/RCTNavigator.m similarity index 99% rename from ReactKit/Views/RCTNavigator.m rename to React/Views/RCTNavigator.m index e3ee09a5a..373313b93 100644 --- a/ReactKit/Views/RCTNavigator.m +++ b/React/Views/RCTNavigator.m @@ -17,7 +17,7 @@ #import "RCTUtils.h" #import "RCTView.h" #import "RCTWrapperViewController.h" -#import "UIView+ReactKit.h" +#import "UIView+React.h" typedef NS_ENUM(NSUInteger, RCTNavigationLock) { RCTNavigationLockNone, diff --git a/ReactKit/Views/RCTNavigatorManager.h b/React/Views/RCTNavigatorManager.h similarity index 100% rename from ReactKit/Views/RCTNavigatorManager.h rename to React/Views/RCTNavigatorManager.h diff --git a/ReactKit/Views/RCTNavigatorManager.m b/React/Views/RCTNavigatorManager.m similarity index 100% rename from ReactKit/Views/RCTNavigatorManager.m rename to React/Views/RCTNavigatorManager.m diff --git a/ReactKit/Views/RCTPicker.h b/React/Views/RCTPicker.h similarity index 100% rename from ReactKit/Views/RCTPicker.h rename to React/Views/RCTPicker.h diff --git a/ReactKit/Views/RCTPicker.m b/React/Views/RCTPicker.m similarity index 98% rename from ReactKit/Views/RCTPicker.m rename to React/Views/RCTPicker.m index a8271e3e3..dd2bcdb8a 100644 --- a/ReactKit/Views/RCTPicker.m +++ b/React/Views/RCTPicker.m @@ -12,7 +12,7 @@ #import "RCTConvert.h" #import "RCTEventDispatcher.h" #import "RCTUtils.h" -#import "UIView+ReactKit.h" +#import "UIView+React.h" const NSInteger UNINITIALIZED_INDEX = -1; diff --git a/ReactKit/Views/RCTPickerManager.h b/React/Views/RCTPickerManager.h similarity index 100% rename from ReactKit/Views/RCTPickerManager.h rename to React/Views/RCTPickerManager.h diff --git a/ReactKit/Views/RCTPickerManager.m b/React/Views/RCTPickerManager.m similarity index 100% rename from ReactKit/Views/RCTPickerManager.m rename to React/Views/RCTPickerManager.m diff --git a/ReactKit/Views/RCTPointerEvents.h b/React/Views/RCTPointerEvents.h similarity index 100% rename from ReactKit/Views/RCTPointerEvents.h rename to React/Views/RCTPointerEvents.h diff --git a/ReactKit/Views/RCTScrollView.h b/React/Views/RCTScrollView.h similarity index 100% rename from ReactKit/Views/RCTScrollView.h rename to React/Views/RCTScrollView.h diff --git a/ReactKit/Views/RCTScrollView.m b/React/Views/RCTScrollView.m similarity index 99% rename from ReactKit/Views/RCTScrollView.m rename to React/Views/RCTScrollView.m index 8c3db22be..e3e1c2f79 100644 --- a/ReactKit/Views/RCTScrollView.m +++ b/React/Views/RCTScrollView.m @@ -16,7 +16,7 @@ #import "RCTLog.h" #import "RCTUIManager.h" #import "RCTUtils.h" -#import "UIView+ReactKit.h" +#import "UIView+React.h" CGFloat const ZINDEX_DEFAULT = 0; CGFloat const ZINDEX_STICKY_HEADER = 50; diff --git a/ReactKit/Views/RCTScrollViewManager.h b/React/Views/RCTScrollViewManager.h similarity index 100% rename from ReactKit/Views/RCTScrollViewManager.h rename to React/Views/RCTScrollViewManager.h diff --git a/ReactKit/Views/RCTScrollViewManager.m b/React/Views/RCTScrollViewManager.m similarity index 100% rename from ReactKit/Views/RCTScrollViewManager.m rename to React/Views/RCTScrollViewManager.m diff --git a/ReactKit/Views/RCTScrollableProtocol.h b/React/Views/RCTScrollableProtocol.h similarity index 100% rename from ReactKit/Views/RCTScrollableProtocol.h rename to React/Views/RCTScrollableProtocol.h diff --git a/ReactKit/Views/RCTShadowView.h b/React/Views/RCTShadowView.h similarity index 100% rename from ReactKit/Views/RCTShadowView.h rename to React/Views/RCTShadowView.h diff --git a/ReactKit/Views/RCTShadowView.m b/React/Views/RCTShadowView.m similarity index 100% rename from ReactKit/Views/RCTShadowView.m rename to React/Views/RCTShadowView.m diff --git a/ReactKit/Views/RCTSliderManager.h b/React/Views/RCTSliderManager.h similarity index 100% rename from ReactKit/Views/RCTSliderManager.h rename to React/Views/RCTSliderManager.h diff --git a/ReactKit/Views/RCTSliderManager.m b/React/Views/RCTSliderManager.m similarity index 97% rename from ReactKit/Views/RCTSliderManager.m rename to React/Views/RCTSliderManager.m index 52264825b..0228eab68 100644 --- a/ReactKit/Views/RCTSliderManager.m +++ b/React/Views/RCTSliderManager.m @@ -11,7 +11,7 @@ #import "RCTBridge.h" #import "RCTEventDispatcher.h" -#import "UIView+ReactKit.h" +#import "UIView+React.h" @implementation RCTSliderManager diff --git a/ReactKit/Views/RCTSwitch.h b/React/Views/RCTSwitch.h similarity index 100% rename from ReactKit/Views/RCTSwitch.h rename to React/Views/RCTSwitch.h diff --git a/ReactKit/Views/RCTSwitch.m b/React/Views/RCTSwitch.m similarity index 94% rename from ReactKit/Views/RCTSwitch.m rename to React/Views/RCTSwitch.m index 94ee6b905..6c4e28564 100644 --- a/ReactKit/Views/RCTSwitch.m +++ b/React/Views/RCTSwitch.m @@ -10,7 +10,7 @@ #import "RCTSwitch.h" #import "RCTEventDispatcher.h" -#import "UIView+ReactKit.h" +#import "UIView+React.h" @implementation RCTSwitch diff --git a/ReactKit/Views/RCTSwitchManager.h b/React/Views/RCTSwitchManager.h similarity index 100% rename from ReactKit/Views/RCTSwitchManager.h rename to React/Views/RCTSwitchManager.h diff --git a/ReactKit/Views/RCTSwitchManager.m b/React/Views/RCTSwitchManager.m similarity index 97% rename from ReactKit/Views/RCTSwitchManager.m rename to React/Views/RCTSwitchManager.m index 260403643..e2118023d 100644 --- a/ReactKit/Views/RCTSwitchManager.m +++ b/React/Views/RCTSwitchManager.m @@ -12,7 +12,7 @@ #import "RCTBridge.h" #import "RCTEventDispatcher.h" #import "RCTSwitch.h" -#import "UIView+ReactKit.h" +#import "UIView+React.h" @implementation RCTSwitchManager diff --git a/ReactKit/Views/RCTTabBar.h b/React/Views/RCTTabBar.h similarity index 100% rename from ReactKit/Views/RCTTabBar.h rename to React/Views/RCTTabBar.h diff --git a/ReactKit/Views/RCTTabBar.m b/React/Views/RCTTabBar.m similarity index 99% rename from ReactKit/Views/RCTTabBar.m rename to React/Views/RCTTabBar.m index 86e609df9..11ad47e32 100644 --- a/ReactKit/Views/RCTTabBar.m +++ b/React/Views/RCTTabBar.m @@ -16,7 +16,7 @@ #import "RCTView.h" #import "RCTViewControllerProtocol.h" #import "RCTWrapperViewController.h" -#import "UIView+ReactKit.h" +#import "UIView+React.h" @interface RKCustomTabBarController : UITabBarController diff --git a/ReactKit/Views/RCTTabBarItem.h b/React/Views/RCTTabBarItem.h similarity index 100% rename from ReactKit/Views/RCTTabBarItem.h rename to React/Views/RCTTabBarItem.h diff --git a/ReactKit/Views/RCTTabBarItem.m b/React/Views/RCTTabBarItem.m similarity index 98% rename from ReactKit/Views/RCTTabBarItem.m rename to React/Views/RCTTabBarItem.m index 9de3ac929..530fef893 100644 --- a/ReactKit/Views/RCTTabBarItem.m +++ b/React/Views/RCTTabBarItem.m @@ -11,7 +11,7 @@ #import "RCTConvert.h" #import "RCTLog.h" -#import "UIView+ReactKit.h" +#import "UIView+React.h" @implementation RCTTabBarItem diff --git a/ReactKit/Views/RCTTabBarItemManager.h b/React/Views/RCTTabBarItemManager.h similarity index 100% rename from ReactKit/Views/RCTTabBarItemManager.h rename to React/Views/RCTTabBarItemManager.h diff --git a/ReactKit/Views/RCTTabBarItemManager.m b/React/Views/RCTTabBarItemManager.m similarity index 100% rename from ReactKit/Views/RCTTabBarItemManager.m rename to React/Views/RCTTabBarItemManager.m diff --git a/ReactKit/Views/RCTTabBarManager.h b/React/Views/RCTTabBarManager.h similarity index 100% rename from ReactKit/Views/RCTTabBarManager.h rename to React/Views/RCTTabBarManager.h diff --git a/ReactKit/Views/RCTTabBarManager.m b/React/Views/RCTTabBarManager.m similarity index 100% rename from ReactKit/Views/RCTTabBarManager.m rename to React/Views/RCTTabBarManager.m diff --git a/ReactKit/Views/RCTTextField.h b/React/Views/RCTTextField.h similarity index 100% rename from ReactKit/Views/RCTTextField.h rename to React/Views/RCTTextField.h diff --git a/ReactKit/Views/RCTTextField.m b/React/Views/RCTTextField.m similarity index 99% rename from ReactKit/Views/RCTTextField.m rename to React/Views/RCTTextField.m index 4901be411..1ccf17d7f 100644 --- a/ReactKit/Views/RCTTextField.m +++ b/React/Views/RCTTextField.m @@ -12,7 +12,7 @@ #import "RCTConvert.h" #import "RCTEventDispatcher.h" #import "RCTUtils.h" -#import "UIView+ReactKit.h" +#import "UIView+React.h" @implementation RCTTextField { diff --git a/ReactKit/Views/RCTTextFieldManager.h b/React/Views/RCTTextFieldManager.h similarity index 100% rename from ReactKit/Views/RCTTextFieldManager.h rename to React/Views/RCTTextFieldManager.h diff --git a/ReactKit/Views/RCTTextFieldManager.m b/React/Views/RCTTextFieldManager.m similarity index 100% rename from ReactKit/Views/RCTTextFieldManager.m rename to React/Views/RCTTextFieldManager.m diff --git a/ReactKit/Views/RCTUIActivityIndicatorViewManager.h b/React/Views/RCTUIActivityIndicatorViewManager.h similarity index 100% rename from ReactKit/Views/RCTUIActivityIndicatorViewManager.h rename to React/Views/RCTUIActivityIndicatorViewManager.h diff --git a/ReactKit/Views/RCTUIActivityIndicatorViewManager.m b/React/Views/RCTUIActivityIndicatorViewManager.m similarity index 100% rename from ReactKit/Views/RCTUIActivityIndicatorViewManager.m rename to React/Views/RCTUIActivityIndicatorViewManager.m diff --git a/ReactKit/Views/RCTView.h b/React/Views/RCTView.h similarity index 100% rename from ReactKit/Views/RCTView.h rename to React/Views/RCTView.h diff --git a/ReactKit/Views/RCTView.m b/React/Views/RCTView.m similarity index 99% rename from ReactKit/Views/RCTView.m rename to React/Views/RCTView.m index 7d4d12aac..febf56703 100644 --- a/ReactKit/Views/RCTView.m +++ b/React/Views/RCTView.m @@ -12,7 +12,7 @@ #import "RCTAutoInsetsProtocol.h" #import "RCTConvert.h" #import "RCTLog.h" -#import "UIView+ReactKit.h" +#import "UIView+React.h" static const RCTBorderSide RCTBorderSideCount = 4; diff --git a/ReactKit/Views/RCTViewControllerProtocol.h b/React/Views/RCTViewControllerProtocol.h similarity index 100% rename from ReactKit/Views/RCTViewControllerProtocol.h rename to React/Views/RCTViewControllerProtocol.h diff --git a/ReactKit/Views/RCTViewManager.h b/React/Views/RCTViewManager.h similarity index 100% rename from ReactKit/Views/RCTViewManager.h rename to React/Views/RCTViewManager.h diff --git a/ReactKit/Views/RCTViewManager.m b/React/Views/RCTViewManager.m similarity index 98% rename from ReactKit/Views/RCTViewManager.m rename to React/Views/RCTViewManager.m index 79a9c22da..fa9975ac8 100644 --- a/ReactKit/Views/RCTViewManager.m +++ b/React/Views/RCTViewManager.m @@ -102,7 +102,7 @@ RCT_CUSTOM_VIEW_PROPERTY(pointerEvents, RCTPointerEvents, RCTView) case RCTPointerEventsUnspecified: // Pointer events "unspecified" acts as if a stylesheet had not specified, // which is different than "auto" in CSS (which cannot and will not be - // supported in `ReactKit`. "auto" may override a parent's "none". + // supported in `React`. "auto" may override a parent's "none". // Unspecified values do not. // This wouldn't override a container view's `userInteractionEnabled = NO` view.userInteractionEnabled = YES; diff --git a/ReactKit/Views/RCTViewNodeProtocol.h b/React/Views/RCTViewNodeProtocol.h similarity index 94% rename from ReactKit/Views/RCTViewNodeProtocol.h rename to React/Views/RCTViewNodeProtocol.h index 998c53bce..691aaaba1 100644 --- a/ReactKit/Views/RCTViewNodeProtocol.h +++ b/React/Views/RCTViewNodeProtocol.h @@ -9,7 +9,7 @@ /** * Logical node in a tree of application components. Both `ShadowView`s and - * `UIView+ReactKit`s conform to this. Allows us to write utilities that + * `UIView+React`s conform to this. Allows us to write utilities that * reason about trees generally. */ @protocol RCTViewNodeProtocol diff --git a/ReactKit/Views/RCTWebView.h b/React/Views/RCTWebView.h similarity index 100% rename from ReactKit/Views/RCTWebView.h rename to React/Views/RCTWebView.h diff --git a/ReactKit/Views/RCTWebView.m b/React/Views/RCTWebView.m similarity index 99% rename from ReactKit/Views/RCTWebView.m rename to React/Views/RCTWebView.m index feb9669d8..86dae0172 100644 --- a/ReactKit/Views/RCTWebView.m +++ b/React/Views/RCTWebView.m @@ -16,7 +16,7 @@ #import "RCTLog.h" #import "RCTUtils.h" #import "RCTView.h" -#import "UIView+ReactKit.h" +#import "UIView+React.h" @interface RCTWebView () diff --git a/ReactKit/Views/RCTWebViewManager.h b/React/Views/RCTWebViewManager.h similarity index 100% rename from ReactKit/Views/RCTWebViewManager.h rename to React/Views/RCTWebViewManager.h diff --git a/ReactKit/Views/RCTWebViewManager.m b/React/Views/RCTWebViewManager.m similarity index 100% rename from ReactKit/Views/RCTWebViewManager.m rename to React/Views/RCTWebViewManager.m diff --git a/ReactKit/Views/RCTWrapperViewController.h b/React/Views/RCTWrapperViewController.h similarity index 100% rename from ReactKit/Views/RCTWrapperViewController.h rename to React/Views/RCTWrapperViewController.h diff --git a/ReactKit/Views/RCTWrapperViewController.m b/React/Views/RCTWrapperViewController.m similarity index 99% rename from ReactKit/Views/RCTWrapperViewController.m rename to React/Views/RCTWrapperViewController.m index e9b9d5c77..2008c1f83 100644 --- a/ReactKit/Views/RCTWrapperViewController.m +++ b/React/Views/RCTWrapperViewController.m @@ -15,7 +15,7 @@ #import "RCTNavItem.h" #import "RCTUtils.h" #import "RCTViewControllerProtocol.h" -#import "UIView+ReactKit.h" +#import "UIView+React.h" @implementation RCTWrapperViewController { diff --git a/ReactKit/Views/UIView+ReactKit.h b/React/Views/UIView+React.h similarity index 95% rename from ReactKit/Views/UIView+ReactKit.h rename to React/Views/UIView+React.h index ab978e58d..28bca9db9 100644 --- a/ReactKit/Views/UIView+ReactKit.h +++ b/React/Views/UIView+React.h @@ -13,7 +13,7 @@ //TODO: let's try to eliminate this category if possible -@interface UIView (ReactKit) +@interface UIView (React) /** * Used by the UIIManager to set the view frame. diff --git a/ReactKit/Views/UIView+ReactKit.m b/React/Views/UIView+React.m similarity index 98% rename from ReactKit/Views/UIView+ReactKit.m rename to React/Views/UIView+React.m index 0ea1df053..6e4a8c45c 100644 --- a/ReactKit/Views/UIView+ReactKit.m +++ b/React/Views/UIView+React.m @@ -7,7 +7,7 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "UIView+ReactKit.h" +#import "UIView+React.h" #import @@ -15,7 +15,7 @@ #import "RCTLog.h" #import "RCTWrapperViewController.h" -@implementation UIView (ReactKit) +@implementation UIView (React) - (NSNumber *)reactTag { diff --git a/package.json b/package.json index 3cc2ae49c..c9a561ba4 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ }, "main": "Libraries/react-native/react-native.js", "files": [ - "ReactKit", + "React", "Examples/SampleApp", "Libraries", "packager",