From 3daaf1741c6825a5d0155f8e3f3a590ea80abc2a Mon Sep 17 00:00:00 2001 From: Spencer Ahrens Date: Tue, 3 Mar 2015 10:19:15 -0800 Subject: [PATCH] [ReactNative] Clean up libraries and include paths --- .../Movies/Movies.xcodeproj/project.pbxproj | 181 +++++++----------- .../TicTacToe.xcodeproj/project.pbxproj | 140 +++++++------- .../UIExplorer.xcodeproj/project.pbxproj | 71 ++----- .../RCTNetworkImage.xcodeproj/project.pbxproj | 107 ----------- .../RCTDataManager.xcodeproj/project.pbxproj | 107 ----------- .../Text/RCTText.xcodeproj/project.pbxproj | 107 ----------- 6 files changed, 159 insertions(+), 554 deletions(-) diff --git a/Examples/Movies/Movies.xcodeproj/project.pbxproj b/Examples/Movies/Movies.xcodeproj/project.pbxproj index 05e45f8f6..00dd93007 100644 --- a/Examples/Movies/Movies.xcodeproj/project.pbxproj +++ b/Examples/Movies/Movies.xcodeproj/project.pbxproj @@ -11,56 +11,35 @@ 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 */; }; - 587651131A9EB12E008B8F17 /* libRCTDataManager.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 587650FF1A9EB120008B8F17 /* libRCTDataManager.a */; }; - 587651141A9EB12E008B8F17 /* libRCTNetworkImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 587651051A9EB120008B8F17 /* libRCTNetworkImage.a */; }; - 587651151A9EB12E008B8F17 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5876510D1A9EB120008B8F17 /* libRCTText.a */; }; - 587651161A9EB12E008B8F17 /* libReactKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 587651121A9EB120008B8F17 /* libReactKit.a */; }; + 58C572691AA6239800CDF9C8 /* libRCTDataManager.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58C572631AA6236600CDF9C8 /* libRCTDataManager.a */; }; + 58C5726A1AA6239B00CDF9C8 /* libRCTNetworkImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58C572561AA6236500CDF9C8 /* libRCTNetworkImage.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 */ - 587650FE1A9EB120008B8F17 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 587650F01A9EB120008B8F17 /* RCTDataManager.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 58B511DB1A9E6C8500147676; - remoteInfo = RCTDataManager; - }; - 587651001A9EB120008B8F17 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 587650F01A9EB120008B8F17 /* RCTDataManager.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 58B511E61A9E6C8500147676; - remoteInfo = RCTDataManagerTests; - }; - 587651041A9EB120008B8F17 /* PBXContainerItemProxy */ = { + 58C572551AA6236500CDF9C8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 587650F31A9EB120008B8F17 /* RCTNetworkImage.xcodeproj */; proxyType = 2; remoteGlobalIDString = 58B5115D1A9E6B3D00147676; remoteInfo = RCTNetworkImage; }; - 587651061A9EB120008B8F17 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 587650F31A9EB120008B8F17 /* RCTNetworkImage.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 58B511681A9E6B3D00147676; - remoteInfo = RCTNetworkImageTests; - }; - 5876510C1A9EB120008B8F17 /* PBXContainerItemProxy */ = { + 58C5725A1AA6236500CDF9C8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 587650F61A9EB120008B8F17 /* RCTText.xcodeproj */; proxyType = 2; remoteGlobalIDString = 58B5119B1A9E6C1200147676; remoteInfo = RCTText; }; - 5876510E1A9EB120008B8F17 /* PBXContainerItemProxy */ = { + 58C572621AA6236600CDF9C8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 587650F61A9EB120008B8F17 /* RCTText.xcodeproj */; + containerPortal = 587650F01A9EB120008B8F17 /* RCTDataManager.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 58B511A61A9E6C1300147676; - remoteInfo = RCTTextTests; + remoteGlobalIDString = 58B511DB1A9E6C8500147676; + remoteInfo = RCTDataManager; }; - 587651111A9EB120008B8F17 /* PBXContainerItemProxy */ = { + 58C572671AA6236600CDF9C8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 587650F91A9EB120008B8F17 /* ReactKit.xcodeproj */; proxyType = 2; @@ -77,10 +56,10 @@ 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 = ""; }; - 587650F01A9EB120008B8F17 /* RCTDataManager.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTDataManager.xcodeproj; path = "/Users/sahrens/src/fbobjc-hg/Libraries/FBReactKit/js/react-native-github/Libraries/RCTStandardLibrary/../Network/RCTDataManager.xcodeproj"; sourceTree = ""; }; - 587650F31A9EB120008B8F17 /* RCTNetworkImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetworkImage.xcodeproj; path = "/Users/sahrens/src/fbobjc-hg/Libraries/FBReactKit/js/react-native-github/Libraries/RCTStandardLibrary/../Image/RCTNetworkImage.xcodeproj"; sourceTree = ""; }; - 587650F61A9EB120008B8F17 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "/Users/sahrens/src/fbobjc-hg/Libraries/FBReactKit/js/react-native-github/Libraries/RCTStandardLibrary/../Text/RCTText.xcodeproj"; sourceTree = ""; }; - 587650F91A9EB120008B8F17 /* ReactKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactKit.xcodeproj; path = "/Users/sahrens/src/fbobjc-hg/Libraries/FBReactKit/js/react-native-github/Libraries/RCTStandardLibrary/../../ReactKit/ReactKit.xcodeproj"; sourceTree = ""; }; + 587650F01A9EB120008B8F17 /* RCTDataManager.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTDataManager.xcodeproj; path = ../../Libraries/Network/RCTDataManager.xcodeproj; sourceTree = SOURCE_ROOT; }; + 587650F31A9EB120008B8F17 /* RCTNetworkImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetworkImage.xcodeproj; path = ../../Libraries/Image/RCTNetworkImage.xcodeproj; sourceTree = SOURCE_ROOT; }; + 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 */ @@ -88,10 +67,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 587651131A9EB12E008B8F17 /* libRCTDataManager.a in Frameworks */, - 587651141A9EB12E008B8F17 /* libRCTNetworkImage.a in Frameworks */, - 587651151A9EB12E008B8F17 /* libRCTText.a in Frameworks */, - 587651161A9EB12E008B8F17 /* libReactKit.a in Frameworks */, + 58C572691AA6239800CDF9C8 /* libRCTDataManager.a in Frameworks */, + 58C5726A1AA6239B00CDF9C8 /* libRCTNetworkImage.a in Frameworks */, + 58C5726B1AA6239E00CDF9C8 /* libRCTText.a in Frameworks */, + 58C5726C1AA623A200CDF9C8 /* libReactKit.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -111,41 +90,6 @@ name = Movies; sourceTree = ""; }; - 587650F11A9EB120008B8F17 /* Products */ = { - isa = PBXGroup; - children = ( - 587650FF1A9EB120008B8F17 /* libRCTDataManager.a */, - 587651011A9EB120008B8F17 /* RCTDataManagerTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; - 587650F41A9EB120008B8F17 /* Products */ = { - isa = PBXGroup; - children = ( - 587651051A9EB120008B8F17 /* libRCTNetworkImage.a */, - 587651071A9EB120008B8F17 /* RCTNetworkImageTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; - 587650F71A9EB120008B8F17 /* Products */ = { - isa = PBXGroup; - children = ( - 5876510D1A9EB120008B8F17 /* libRCTText.a */, - 5876510F1A9EB120008B8F17 /* RCTTextTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; - 587650FA1A9EB120008B8F17 /* Products */ = { - isa = PBXGroup; - children = ( - 587651121A9EB120008B8F17 /* libReactKit.a */, - ); - name = Products; - sourceTree = ""; - }; 58C571FC1AA6124500CDF9C8 /* Libraries */ = { isa = PBXGroup; children = ( @@ -157,6 +101,38 @@ name = Libraries; sourceTree = ""; }; + 58C572521AA6236500CDF9C8 /* Products */ = { + isa = PBXGroup; + children = ( + 58C572561AA6236500CDF9C8 /* libRCTNetworkImage.a */, + ); + name = Products; + sourceTree = ""; + }; + 58C572571AA6236500CDF9C8 /* Products */ = { + isa = PBXGroup; + children = ( + 58C5725B1AA6236500CDF9C8 /* libRCTText.a */, + ); + name = Products; + sourceTree = ""; + }; + 58C5725C1AA6236500CDF9C8 /* Products */ = { + isa = PBXGroup; + children = ( + 58C572681AA6236600CDF9C8 /* libReactKit.a */, + ); + name = Products; + sourceTree = ""; + }; + 58C5725E1AA6236500CDF9C8 /* Products */ = { + isa = PBXGroup; + children = ( + 58C572631AA6236600CDF9C8 /* libRCTDataManager.a */, + ); + name = Products; + sourceTree = ""; + }; 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( @@ -216,19 +192,19 @@ projectDirPath = ""; projectReferences = ( { - ProductGroup = 587650F11A9EB120008B8F17 /* Products */; + ProductGroup = 58C5725E1AA6236500CDF9C8 /* Products */; ProjectRef = 587650F01A9EB120008B8F17 /* RCTDataManager.xcodeproj */; }, { - ProductGroup = 587650F41A9EB120008B8F17 /* Products */; + ProductGroup = 58C572521AA6236500CDF9C8 /* Products */; ProjectRef = 587650F31A9EB120008B8F17 /* RCTNetworkImage.xcodeproj */; }, { - ProductGroup = 587650F71A9EB120008B8F17 /* Products */; + ProductGroup = 58C572571AA6236500CDF9C8 /* Products */; ProjectRef = 587650F61A9EB120008B8F17 /* RCTText.xcodeproj */; }, { - ProductGroup = 587650FA1A9EB120008B8F17 /* Products */; + ProductGroup = 58C5725C1AA6236500CDF9C8 /* Products */; ProjectRef = 587650F91A9EB120008B8F17 /* ReactKit.xcodeproj */; }, ); @@ -240,53 +216,32 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 587650FF1A9EB120008B8F17 /* libRCTDataManager.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRCTDataManager.a; - remoteRef = 587650FE1A9EB120008B8F17 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 587651011A9EB120008B8F17 /* RCTDataManagerTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = RCTDataManagerTests.xctest; - remoteRef = 587651001A9EB120008B8F17 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 587651051A9EB120008B8F17 /* libRCTNetworkImage.a */ = { + 58C572561AA6236500CDF9C8 /* libRCTNetworkImage.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libRCTNetworkImage.a; - remoteRef = 587651041A9EB120008B8F17 /* PBXContainerItemProxy */; + remoteRef = 58C572551AA6236500CDF9C8 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 587651071A9EB120008B8F17 /* RCTNetworkImageTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = RCTNetworkImageTests.xctest; - remoteRef = 587651061A9EB120008B8F17 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 5876510D1A9EB120008B8F17 /* libRCTText.a */ = { + 58C5725B1AA6236500CDF9C8 /* libRCTText.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libRCTText.a; - remoteRef = 5876510C1A9EB120008B8F17 /* PBXContainerItemProxy */; + remoteRef = 58C5725A1AA6236500CDF9C8 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 5876510F1A9EB120008B8F17 /* RCTTextTests.xctest */ = { + 58C572631AA6236600CDF9C8 /* libRCTDataManager.a */ = { isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = RCTTextTests.xctest; - remoteRef = 5876510E1A9EB120008B8F17 /* PBXContainerItemProxy */; + fileType = archive.ar; + path = libRCTDataManager.a; + remoteRef = 58C572621AA6236600CDF9C8 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 587651121A9EB120008B8F17 /* libReactKit.a */ = { + 58C572681AA6236600CDF9C8 /* libReactKit.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libReactKit.a; - remoteRef = 587651111A9EB120008B8F17 /* PBXContainerItemProxy */; + remoteRef = 58C572671AA6236600CDF9C8 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ @@ -338,6 +293,9 @@ ); INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = Movies; }; @@ -354,6 +312,9 @@ ); INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = Movies; }; diff --git a/Examples/TicTacToe/TicTacToe.xcodeproj/project.pbxproj b/Examples/TicTacToe/TicTacToe.xcodeproj/project.pbxproj index 22d1b4e04..4d0d681de 100644 --- a/Examples/TicTacToe/TicTacToe.xcodeproj/project.pbxproj +++ b/Examples/TicTacToe/TicTacToe.xcodeproj/project.pbxproj @@ -11,33 +11,12 @@ 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 */; }; - 587650E91A9EB103008B8F17 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 587650E01A9EB0DB008B8F17 /* libRCTText.a */; }; - 587650EA1A9EB103008B8F17 /* libReactKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 587650E81A9EB0E0008B8F17 /* libReactKit.a */; }; 58C571F31AA611C900CDF9C8 /* libRCTNetworkImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58C571ED1AA611BA00CDF9C8 /* libRCTNetworkImage.a */; }; + 58C572501AA6229900CDF9C8 /* libReactKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58C572471AA6224300CDF9C8 /* libReactKit.a */; }; + 58C572511AA6229D00CDF9C8 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58C5724D1AA6224400CDF9C8 /* libRCTText.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 587650DF1A9EB0DB008B8F17 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 587650DA1A9EB0DB008B8F17 /* RCTText.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 58B5119B1A9E6C1200147676; - remoteInfo = RCTText; - }; - 587650E11A9EB0DB008B8F17 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 587650DA1A9EB0DB008B8F17 /* RCTText.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 58B511A61A9E6C1300147676; - remoteInfo = RCTTextTests; - }; - 587650E71A9EB0E0008B8F17 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 587650E31A9EB0DF008B8F17 /* ReactKit.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; - remoteInfo = ReactKit; - }; 58C571EC1AA611BA00CDF9C8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 58C571E71AA611BA00CDF9C8 /* RCTNetworkImage.xcodeproj */; @@ -52,6 +31,27 @@ remoteGlobalIDString = 58B511681A9E6B3D00147676; remoteInfo = RCTNetworkImageTests; }; + 58C572461AA6224300CDF9C8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 587650E31A9EB0DF008B8F17 /* ReactKit.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; + remoteInfo = ReactKit; + }; + 58C5724C1AA6224400CDF9C8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 587650DA1A9EB0DB008B8F17 /* RCTText.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 58B5119B1A9E6C1200147676; + remoteInfo = RCTText; + }; + 58C5724E1AA6224400CDF9C8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 587650DA1A9EB0DB008B8F17 /* RCTText.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 58B511A61A9E6C1300147676; + remoteInfo = RCTTextTests; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -62,8 +62,8 @@ 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 = ""; }; - 587650DA1A9EB0DB008B8F17 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "/Users/sahrens/src/fbobjc-hg/Libraries/FBReactKit/js/react-native-github/Libraries/RCTStandardLibrary/../Text/RCTText.xcodeproj"; sourceTree = ""; }; - 587650E31A9EB0DF008B8F17 /* ReactKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactKit.xcodeproj; path = "/Users/sahrens/src/fbobjc-hg/Libraries/FBReactKit/js/react-native-github/Libraries/RCTStandardLibrary/../../ReactKit/ReactKit.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 = ""; }; 58C571E71AA611BA00CDF9C8 /* RCTNetworkImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetworkImage.xcodeproj; path = ../../Libraries/Image/RCTNetworkImage.xcodeproj; sourceTree = ""; }; /* End PBXFileReference section */ @@ -73,8 +73,8 @@ buildActionMask = 2147483647; files = ( 58C571F31AA611C900CDF9C8 /* libRCTNetworkImage.a in Frameworks */, - 587650E91A9EB103008B8F17 /* libRCTText.a in Frameworks */, - 587650EA1A9EB103008B8F17 /* libReactKit.a in Frameworks */, + 58C572501AA6229900CDF9C8 /* libReactKit.a in Frameworks */, + 58C572511AA6229D00CDF9C8 /* libRCTText.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -94,23 +94,6 @@ name = TicTacToe; sourceTree = ""; }; - 587650DB1A9EB0DB008B8F17 /* Products */ = { - isa = PBXGroup; - children = ( - 587650E01A9EB0DB008B8F17 /* libRCTText.a */, - 587650E21A9EB0DB008B8F17 /* RCTTextTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; - 587650E41A9EB0DF008B8F17 /* Products */ = { - isa = PBXGroup; - children = ( - 587650E81A9EB0E0008B8F17 /* libReactKit.a */, - ); - name = Products; - sourceTree = ""; - }; 58C571E81AA611BA00CDF9C8 /* Products */ = { isa = PBXGroup; children = ( @@ -130,6 +113,23 @@ name = Libraries; sourceTree = ""; }; + 58C572411AA6224300CDF9C8 /* Products */ = { + isa = PBXGroup; + children = ( + 58C572471AA6224300CDF9C8 /* libReactKit.a */, + ); + name = Products; + sourceTree = ""; + }; + 58C572481AA6224300CDF9C8 /* Products */ = { + isa = PBXGroup; + children = ( + 58C5724D1AA6224400CDF9C8 /* libRCTText.a */, + 58C5724F1AA6224400CDF9C8 /* RCTTextTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( @@ -193,11 +193,11 @@ ProjectRef = 58C571E71AA611BA00CDF9C8 /* RCTNetworkImage.xcodeproj */; }, { - ProductGroup = 587650DB1A9EB0DB008B8F17 /* Products */; + ProductGroup = 58C572481AA6224300CDF9C8 /* Products */; ProjectRef = 587650DA1A9EB0DB008B8F17 /* RCTText.xcodeproj */; }, { - ProductGroup = 587650E41A9EB0DF008B8F17 /* Products */; + ProductGroup = 58C572411AA6224300CDF9C8 /* Products */; ProjectRef = 587650E31A9EB0DF008B8F17 /* ReactKit.xcodeproj */; }, ); @@ -209,27 +209,6 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 587650E01A9EB0DB008B8F17 /* libRCTText.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libRCTText.a; - remoteRef = 587650DF1A9EB0DB008B8F17 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 587650E21A9EB0DB008B8F17 /* RCTTextTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = RCTTextTests.xctest; - remoteRef = 587650E11A9EB0DB008B8F17 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 587650E81A9EB0E0008B8F17 /* libReactKit.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libReactKit.a; - remoteRef = 587650E71A9EB0E0008B8F17 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 58C571ED1AA611BA00CDF9C8 /* libRCTNetworkImage.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -244,6 +223,27 @@ remoteRef = 58C571EE1AA611BA00CDF9C8 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 58C572471AA6224300CDF9C8 /* libReactKit.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libReactKit.a; + remoteRef = 58C572461AA6224300CDF9C8 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 58C5724D1AA6224400CDF9C8 /* libRCTText.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRCTText.a; + remoteRef = 58C5724C1AA6224400CDF9C8 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 58C5724F1AA6224400CDF9C8 /* RCTTextTests.xctest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = RCTTextTests.xctest; + remoteRef = 58C5724E1AA6224400CDF9C8 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -288,6 +288,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = TicTacToe; }; @@ -299,6 +302,9 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = TicTacToe; }; diff --git a/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj b/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj index 493310f0c..daa467234 100644 --- a/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj +++ b/Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj @@ -14,7 +14,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 */; }; - 587651571A9F862F008B8F17 /* libRCTDataManager.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5876514F1A9F8619008B8F17 /* libRCTDataManager.a */; }; + 58C572891AA624A900CDF9C8 /* libRCTDataManager.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58C572851AA6249E00CDF9C8 /* libRCTDataManager.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -25,13 +25,6 @@ remoteGlobalIDString = 58B5119B1A9E6C1200147676; remoteInfo = RCTText; }; - 1316A2091AA386C700C0188E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5876511F1A9EB168008B8F17 /* RCTText.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 58B511A61A9E6C1300147676; - remoteInfo = RCTTextTests; - }; 1316A20F1AA3871A00C0188E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 5876511C1A9EB168008B8F17 /* RCTNetworkImage.xcodeproj */; @@ -39,13 +32,6 @@ remoteGlobalIDString = 58B5115D1A9E6B3D00147676; remoteInfo = RCTNetworkImage; }; - 1316A2111AA3871A00C0188E /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5876511C1A9EB168008B8F17 /* RCTNetworkImage.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 58B511681A9E6B3D00147676; - remoteInfo = RCTNetworkImageTests; - }; 1316A2161AA3875D00C0188E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 587651221A9EB168008B8F17 /* ReactKit.xcodeproj */; @@ -53,20 +39,13 @@ remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192; remoteInfo = ReactKit; }; - 5876514E1A9F8619008B8F17 /* PBXContainerItemProxy */ = { + 58C572841AA6249E00CDF9C8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 587651491A9F8619008B8F17 /* RCTDataManager.xcodeproj */; proxyType = 2; remoteGlobalIDString = 58B511DB1A9E6C8500147676; remoteInfo = RCTDataManager; }; - 587651501A9F8619008B8F17 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 587651491A9F8619008B8F17 /* RCTDataManager.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 58B511E61A9E6C8500147676; - remoteInfo = RCTDataManagerTests; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -80,7 +59,7 @@ 5876511C1A9EB168008B8F17 /* RCTNetworkImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetworkImage.xcodeproj; path = ../../Libraries/Image/RCTNetworkImage.xcodeproj; sourceTree = SOURCE_ROOT; }; 5876511F1A9EB168008B8F17 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../../Libraries/Text/RCTText.xcodeproj; sourceTree = SOURCE_ROOT; }; 587651221A9EB168008B8F17 /* ReactKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactKit.xcodeproj; path = ../../ReactKit/ReactKit.xcodeproj; sourceTree = SOURCE_ROOT; }; - 587651491A9F8619008B8F17 /* RCTDataManager.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTDataManager.xcodeproj; path = ../../Libraries/Network/RCTDataManager.xcodeproj; sourceTree = ""; }; + 587651491A9F8619008B8F17 /* RCTDataManager.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTDataManager.xcodeproj; path = ../../Libraries/Network/RCTDataManager.xcodeproj; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -90,8 +69,8 @@ files = ( 1316A21A1AA397CA00C0188E /* libRCTNetworkImage.a in Frameworks */, 1316A21B1AA397CA00C0188E /* libRCTText.a in Frameworks */, + 58C572891AA624A900CDF9C8 /* libRCTDataManager.a in Frameworks */, 1316A21C1AA397CA00C0188E /* libReactKit.a in Frameworks */, - 587651571A9F862F008B8F17 /* libRCTDataManager.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -102,7 +81,6 @@ isa = PBXGroup; children = ( 1316A2081AA386C700C0188E /* libRCTText.a */, - 1316A20A1AA386C700C0188E /* RCTTextTests.xctest */, ); name = Products; sourceTree = ""; @@ -111,7 +89,6 @@ isa = PBXGroup; children = ( 1316A2101AA3871A00C0188E /* libRCTNetworkImage.a */, - 1316A2121AA3871A00C0188E /* RCTNetworkImageTests.xctest */, ); name = Products; sourceTree = ""; @@ -148,11 +125,10 @@ name = UIExplorer; sourceTree = ""; }; - 5876514A1A9F8619008B8F17 /* Products */ = { + 58C572811AA6249E00CDF9C8 /* Products */ = { isa = PBXGroup; children = ( - 5876514F1A9F8619008B8F17 /* libRCTDataManager.a */, - 587651511A9F8619008B8F17 /* RCTDataManagerTests.xctest */, + 58C572851AA6249E00CDF9C8 /* libRCTDataManager.a */, ); name = Products; sourceTree = ""; @@ -216,7 +192,7 @@ projectDirPath = ""; projectReferences = ( { - ProductGroup = 5876514A1A9F8619008B8F17 /* Products */; + ProductGroup = 58C572811AA6249E00CDF9C8 /* Products */; ProjectRef = 587651491A9F8619008B8F17 /* RCTDataManager.xcodeproj */; }, { @@ -247,13 +223,6 @@ remoteRef = 1316A2071AA386C700C0188E /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 1316A20A1AA386C700C0188E /* RCTTextTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = RCTTextTests.xctest; - remoteRef = 1316A2091AA386C700C0188E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 1316A2101AA3871A00C0188E /* libRCTNetworkImage.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -261,13 +230,6 @@ remoteRef = 1316A20F1AA3871A00C0188E /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 1316A2121AA3871A00C0188E /* RCTNetworkImageTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = RCTNetworkImageTests.xctest; - remoteRef = 1316A2111AA3871A00C0188E /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 1316A2171AA3875D00C0188E /* libReactKit.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -275,18 +237,11 @@ remoteRef = 1316A2161AA3875D00C0188E /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 5876514F1A9F8619008B8F17 /* libRCTDataManager.a */ = { + 58C572851AA6249E00CDF9C8 /* libRCTDataManager.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libRCTDataManager.a; - remoteRef = 5876514E1A9F8619008B8F17 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 587651511A9F8619008B8F17 /* RCTDataManagerTests.xctest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = RCTDataManagerTests.xctest; - remoteRef = 587651501A9F8619008B8F17 /* PBXContainerItemProxy */; + remoteRef = 58C572841AA6249E00CDF9C8 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ @@ -335,10 +290,12 @@ "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../../ReactKit/**", - "$(SRCROOT)/../../ReactKitModules/**", ); INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = UIExplorer; }; @@ -352,10 +309,12 @@ "$(inherited)", /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../../ReactKit/**", - "$(SRCROOT)/../../ReactKitModules/**", ); INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = UIExplorer; }; diff --git a/Libraries/Image/RCTNetworkImage.xcodeproj/project.pbxproj b/Libraries/Image/RCTNetworkImage.xcodeproj/project.pbxproj index 0dc8304fa..57b27a3c1 100644 --- a/Libraries/Image/RCTNetworkImage.xcodeproj/project.pbxproj +++ b/Libraries/Image/RCTNetworkImage.xcodeproj/project.pbxproj @@ -7,22 +7,11 @@ objects = { /* Begin PBXBuildFile section */ - 58B511691A9E6B3D00147676 /* libRCTNetworkImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58B5115D1A9E6B3D00147676 /* libRCTNetworkImage.a */; }; 58B5118F1A9E6BD600147676 /* RCTImageDownloader.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B5118A1A9E6BD600147676 /* RCTImageDownloader.m */; }; 58B511901A9E6BD600147676 /* RCTNetworkImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B5118C1A9E6BD600147676 /* RCTNetworkImageView.m */; }; 58B511911A9E6BD600147676 /* RCTNetworkImageViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B5118E1A9E6BD600147676 /* RCTNetworkImageViewManager.m */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 58B5116A1A9E6B3D00147676 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 58B511551A9E6B3D00147676 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 58B5115C1A9E6B3D00147676; - remoteInfo = RCTNetworkImage; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXCopyFilesBuildPhase section */ 58B5115B1A9E6B3D00147676 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -37,7 +26,6 @@ /* Begin PBXFileReference section */ 58B5115D1A9E6B3D00147676 /* libRCTNetworkImage.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTNetworkImage.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 58B511681A9E6B3D00147676 /* RCTNetworkImageTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RCTNetworkImageTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 58B511891A9E6BD600147676 /* RCTImageDownloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTImageDownloader.h; sourceTree = ""; }; 58B5118A1A9E6BD600147676 /* RCTImageDownloader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageDownloader.m; sourceTree = ""; }; 58B5118B1A9E6BD600147676 /* RCTNetworkImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTNetworkImageView.h; sourceTree = ""; }; @@ -54,14 +42,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 58B511651A9E6B3D00147676 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 58B511691A9E6B3D00147676 /* libRCTNetworkImage.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -82,7 +62,6 @@ isa = PBXGroup; children = ( 58B5115D1A9E6B3D00147676 /* libRCTNetworkImage.a */, - 58B511681A9E6B3D00147676 /* RCTNetworkImageTests.xctest */, ); name = Products; sourceTree = ""; @@ -107,24 +86,6 @@ productReference = 58B5115D1A9E6B3D00147676 /* libRCTNetworkImage.a */; productType = "com.apple.product-type.library.static"; }; - 58B511671A9E6B3D00147676 /* RCTNetworkImageTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 58B511741A9E6B3D00147676 /* Build configuration list for PBXNativeTarget "RCTNetworkImageTests" */; - buildPhases = ( - 58B511641A9E6B3D00147676 /* Sources */, - 58B511651A9E6B3D00147676 /* Frameworks */, - 58B511661A9E6B3D00147676 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 58B5116B1A9E6B3D00147676 /* PBXTargetDependency */, - ); - name = RCTNetworkImageTests; - productName = RCTNetworkImageTests; - productReference = 58B511681A9E6B3D00147676 /* RCTNetworkImageTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -137,9 +98,6 @@ 58B5115C1A9E6B3D00147676 = { CreatedOnToolsVersion = 6.1.1; }; - 58B511671A9E6B3D00147676 = { - CreatedOnToolsVersion = 6.1.1; - }; }; }; buildConfigurationList = 58B511581A9E6B3D00147676 /* Build configuration list for PBXProject "RCTNetworkImage" */; @@ -155,21 +113,10 @@ projectRoot = ""; targets = ( 58B5115C1A9E6B3D00147676 /* RCTNetworkImage */, - 58B511671A9E6B3D00147676 /* RCTNetworkImageTests */, ); }; /* End PBXProject section */ -/* Begin PBXResourcesBuildPhase section */ - 58B511661A9E6B3D00147676 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 58B511591A9E6B3D00147676 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -181,23 +128,8 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 58B511641A9E6B3D00147676 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 58B5116B1A9E6B3D00147676 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 58B5115C1A9E6B3D00147676 /* RCTNetworkImage */; - targetProxy = 58B5116A1A9E6B3D00147676 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ 58B5116F1A9E6B3D00147676 /* Debug */ = { isa = XCBuildConfiguration; @@ -301,36 +233,6 @@ }; name = Release; }; - 58B511751A9E6B3D00147676 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = RCTNetworkImageTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 58B511761A9E6B3D00147676 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - INFOPLIST_FILE = RCTNetworkImageTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -352,15 +254,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 58B511741A9E6B3D00147676 /* Build configuration list for PBXNativeTarget "RCTNetworkImageTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 58B511751A9E6B3D00147676 /* Debug */, - 58B511761A9E6B3D00147676 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 58B511551A9E6B3D00147676 /* Project object */; diff --git a/Libraries/Network/RCTDataManager.xcodeproj/project.pbxproj b/Libraries/Network/RCTDataManager.xcodeproj/project.pbxproj index 328a3d60c..81b90312a 100644 --- a/Libraries/Network/RCTDataManager.xcodeproj/project.pbxproj +++ b/Libraries/Network/RCTDataManager.xcodeproj/project.pbxproj @@ -7,20 +7,9 @@ objects = { /* Begin PBXBuildFile section */ - 58B511E71A9E6C8500147676 /* libRCTDataManager.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58B511DB1A9E6C8500147676 /* libRCTDataManager.a */; }; 58B512081A9E6CE300147676 /* RCTDataManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B512071A9E6CE300147676 /* RCTDataManager.m */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 58B511E81A9E6C8500147676 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 58B511D31A9E6C8500147676 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 58B511DA1A9E6C8500147676; - remoteInfo = RCTDataManager; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXCopyFilesBuildPhase section */ 58B511D91A9E6C8500147676 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -35,7 +24,6 @@ /* Begin PBXFileReference section */ 58B511DB1A9E6C8500147676 /* libRCTDataManager.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTDataManager.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 58B511E61A9E6C8500147676 /* RCTDataManagerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RCTDataManagerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 58B512061A9E6CE300147676 /* RCTDataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDataManager.h; sourceTree = ""; }; 58B512071A9E6CE300147676 /* RCTDataManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDataManager.m; sourceTree = ""; }; /* End PBXFileReference section */ @@ -48,14 +36,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 58B511E31A9E6C8500147676 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 58B511E71A9E6C8500147676 /* libRCTDataManager.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -72,7 +52,6 @@ isa = PBXGroup; children = ( 58B511DB1A9E6C8500147676 /* libRCTDataManager.a */, - 58B511E61A9E6C8500147676 /* RCTDataManagerTests.xctest */, ); name = Products; sourceTree = ""; @@ -97,24 +76,6 @@ productReference = 58B511DB1A9E6C8500147676 /* libRCTDataManager.a */; productType = "com.apple.product-type.library.static"; }; - 58B511E51A9E6C8500147676 /* RCTDataManagerTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 58B511F21A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTDataManagerTests" */; - buildPhases = ( - 58B511E21A9E6C8500147676 /* Sources */, - 58B511E31A9E6C8500147676 /* Frameworks */, - 58B511E41A9E6C8500147676 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 58B511E91A9E6C8500147676 /* PBXTargetDependency */, - ); - name = RCTDataManagerTests; - productName = RCTDataManagerTests; - productReference = 58B511E61A9E6C8500147676 /* RCTDataManagerTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -127,9 +88,6 @@ 58B511DA1A9E6C8500147676 = { CreatedOnToolsVersion = 6.1.1; }; - 58B511E51A9E6C8500147676 = { - CreatedOnToolsVersion = 6.1.1; - }; }; }; buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RCTDataManager" */; @@ -145,21 +103,10 @@ projectRoot = ""; targets = ( 58B511DA1A9E6C8500147676 /* RCTDataManager */, - 58B511E51A9E6C8500147676 /* RCTDataManagerTests */, ); }; /* End PBXProject section */ -/* Begin PBXResourcesBuildPhase section */ - 58B511E41A9E6C8500147676 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 58B511D71A9E6C8500147676 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -169,23 +116,8 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 58B511E21A9E6C8500147676 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 58B511E91A9E6C8500147676 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 58B511DA1A9E6C8500147676 /* RCTDataManager */; - targetProxy = 58B511E81A9E6C8500147676 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ 58B511ED1A9E6C8500147676 /* Debug */ = { isa = XCBuildConfiguration; @@ -297,36 +229,6 @@ }; name = Release; }; - 58B511F31A9E6C8500147676 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = RCTDataManagerTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 58B511F41A9E6C8500147676 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - INFOPLIST_FILE = RCTDataManagerTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -348,15 +250,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 58B511F21A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTDataManagerTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 58B511F31A9E6C8500147676 /* Debug */, - 58B511F41A9E6C8500147676 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 58B511D31A9E6C8500147676 /* Project object */; diff --git a/Libraries/Text/RCTText.xcodeproj/project.pbxproj b/Libraries/Text/RCTText.xcodeproj/project.pbxproj index e6e7b4aad..240d7c51b 100644 --- a/Libraries/Text/RCTText.xcodeproj/project.pbxproj +++ b/Libraries/Text/RCTText.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 58B511A71A9E6C1300147676 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58B5119B1A9E6C1200147676 /* libRCTText.a */; }; 58B511CE1A9E6C5C00147676 /* RCTRawTextManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511C71A9E6C5C00147676 /* RCTRawTextManager.m */; }; 58B511CF1A9E6C5C00147676 /* RCTShadowRawText.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511C91A9E6C5C00147676 /* RCTShadowRawText.m */; }; 58B511D01A9E6C5C00147676 /* RCTShadowText.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511CB1A9E6C5C00147676 /* RCTShadowText.m */; }; @@ -15,16 +14,6 @@ 58B512161A9E6EFF00147676 /* RCTText.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B512141A9E6EFF00147676 /* RCTText.m */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 58B511A81A9E6C1300147676 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 58B511931A9E6C1200147676 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 58B5119A1A9E6C1200147676; - remoteInfo = RCTText; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXCopyFilesBuildPhase section */ 58B511991A9E6C1200147676 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -39,7 +28,6 @@ /* Begin PBXFileReference section */ 58B5119B1A9E6C1200147676 /* libRCTText.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTText.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 58B511A61A9E6C1300147676 /* RCTTextTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RCTTextTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 58B511C61A9E6C5C00147676 /* RCTRawTextManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTRawTextManager.h; sourceTree = ""; }; 58B511C71A9E6C5C00147676 /* RCTRawTextManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTRawTextManager.m; sourceTree = ""; }; 58B511C81A9E6C5C00147676 /* RCTShadowRawText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTShadowRawText.h; sourceTree = ""; }; @@ -60,14 +48,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 58B511A31A9E6C1300147676 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 58B511A71A9E6C1300147676 /* libRCTText.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -92,7 +72,6 @@ isa = PBXGroup; children = ( 58B5119B1A9E6C1200147676 /* libRCTText.a */, - 58B511A61A9E6C1300147676 /* RCTTextTests.xctest */, ); name = Products; sourceTree = ""; @@ -117,24 +96,6 @@ productReference = 58B5119B1A9E6C1200147676 /* libRCTText.a */; productType = "com.apple.product-type.library.static"; }; - 58B511A51A9E6C1300147676 /* RCTTextTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 58B511B21A9E6C1300147676 /* Build configuration list for PBXNativeTarget "RCTTextTests" */; - buildPhases = ( - 58B511A21A9E6C1300147676 /* Sources */, - 58B511A31A9E6C1300147676 /* Frameworks */, - 58B511A41A9E6C1300147676 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 58B511A91A9E6C1300147676 /* PBXTargetDependency */, - ); - name = RCTTextTests; - productName = RCTTextTests; - productReference = 58B511A61A9E6C1300147676 /* RCTTextTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -147,9 +108,6 @@ 58B5119A1A9E6C1200147676 = { CreatedOnToolsVersion = 6.1.1; }; - 58B511A51A9E6C1300147676 = { - CreatedOnToolsVersion = 6.1.1; - }; }; }; buildConfigurationList = 58B511961A9E6C1200147676 /* Build configuration list for PBXProject "RCTText" */; @@ -165,21 +123,10 @@ projectRoot = ""; targets = ( 58B5119A1A9E6C1200147676 /* RCTText */, - 58B511A51A9E6C1300147676 /* RCTTextTests */, ); }; /* End PBXProject section */ -/* Begin PBXResourcesBuildPhase section */ - 58B511A41A9E6C1300147676 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 58B511971A9E6C1200147676 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -193,23 +140,8 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 58B511A21A9E6C1300147676 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 58B511A91A9E6C1300147676 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 58B5119A1A9E6C1200147676 /* RCTText */; - targetProxy = 58B511A81A9E6C1300147676 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ 58B511AD1A9E6C1300147676 /* Debug */ = { isa = XCBuildConfiguration; @@ -313,36 +245,6 @@ }; name = Release; }; - 58B511B31A9E6C1300147676 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = RCTTextTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 58B511B41A9E6C1300147676 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - ); - INFOPLIST_FILE = RCTTextTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -364,15 +266,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 58B511B21A9E6C1300147676 /* Build configuration list for PBXNativeTarget "RCTTextTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 58B511B31A9E6C1300147676 /* Debug */, - 58B511B41A9E6C1300147676 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 58B511931A9E6C1200147676 /* Project object */;