Skip to content

Commit 17d5182

Browse files
vjeuxvjeux
committed
Merge pull request #171 from vjeux/update8
Updates from Thu 19 Mar
2 parents 980217c + 031266f commit 17d5182

File tree

88 files changed

+3819
-204
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+3819
-204
lines changed

‎Examples/2048/2048.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434

3535
/* Begin PBXFileReference section */
3636
13B07F961A680F5B00A75B9A /* 2048.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = 2048.app; sourceTree = BUILT_PRODUCTS_DIR; };
37-
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
38-
13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
37+
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = 2048/AppDelegate.h; sourceTree = "<group>"; };
38+
13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = 2048/AppDelegate.m; sourceTree = "<group>"; };
3939
13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
40-
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
41-
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
42-
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
40+
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = 2048/Images.xcassets; sourceTree = "<group>"; };
41+
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = 2048/Info.plist; sourceTree = "<group>"; };
42+
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = 2048/main.m; sourceTree = "<group>"; };
4343
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../../Libraries/Text/RCTText.xcodeproj; sourceTree = "<group>"; };
4444
834D32361A76971A00F38302 /* ReactKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactKit.xcodeproj; path = ../../ReactKit/ReactKit.xcodeproj; sourceTree = "<group>"; };
4545
/* End PBXFileReference section */
@@ -217,6 +217,7 @@
217217
13B07FB21A68108700A75B9A /* Base */,
218218
);
219219
name = LaunchScreen.xib;
220+
path = 2048;
220221
sourceTree = "<group>";
221222
};
222223
/* End PBXVariantGroup section */
@@ -226,7 +227,7 @@
226227
isa = XCBuildConfiguration;
227228
buildSettings = {
228229
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
229-
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
230+
INFOPLIST_FILE = "$(SRCROOT)/2048/Info.plist";
230231
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
231232
OTHER_LDFLAGS = "-ObjC";
232233
PRODUCT_NAME = 2048;
@@ -237,7 +238,7 @@
237238
isa = XCBuildConfiguration;
238239
buildSettings = {
239240
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
240-
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
241+
INFOPLIST_FILE = "$(SRCROOT)/2048/Info.plist";
241242
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
242243
OTHER_LDFLAGS = "-ObjC";
243244
PRODUCT_NAME = 2048;

‎Examples/2048/AppDelegate.h‎ renamed to ‎Examples/2048/2048/AppDelegate.h‎

File renamed without changes.

‎Examples/2048/AppDelegate.m‎ renamed to ‎Examples/2048/2048/AppDelegate.m‎

File renamed without changes.

‎Examples/2048/Base.lproj/LaunchScreen.xib‎ renamed to ‎Examples/2048/2048/Base.lproj/LaunchScreen.xib‎

File renamed without changes.

‎Examples/2048/Images.xcassets/AppIcon.appiconset/Contents.json‎ renamed to ‎Examples/2048/2048/Images.xcassets/AppIcon.appiconset/Contents.json‎

File renamed without changes.

‎Examples/2048/Info.plist‎ renamed to ‎Examples/2048/2048/Info.plist‎

File renamed without changes.

‎Examples/2048/main.m‎ renamed to ‎Examples/2048/2048/main.m‎

File renamed without changes.

‎Examples/Movies/Movies.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@
5252
134180151AA91740003F314A /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = ../../Libraries/Network/RCTNetwork.xcodeproj; sourceTree = "<group>"; };
5353
13442C001AA90E7D0037E5B0 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = ../../Libraries/Image/RCTImage.xcodeproj; sourceTree = "<group>"; };
5454
13B07F961A680F5B00A75B9A /* Movies.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Movies.app; sourceTree = BUILT_PRODUCTS_DIR; };
55-
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
56-
13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
55+
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Movies/AppDelegate.h; sourceTree = "<group>"; };
56+
13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Movies/AppDelegate.m; sourceTree = "<group>"; };
5757
13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
58-
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
59-
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
60-
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
58+
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Movies/Images.xcassets; sourceTree = "<group>"; };
59+
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Movies/Info.plist; sourceTree = "<group>"; };
60+
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Movies/main.m; sourceTree = "<group>"; };
6161
587650F61A9EB120008B8F17 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../../Libraries/Text/RCTText.xcodeproj; sourceTree = SOURCE_ROOT; };
6262
587650F91A9EB120008B8F17 /* ReactKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactKit.xcodeproj; path = ../../ReactKit/ReactKit.xcodeproj; sourceTree = SOURCE_ROOT; };
6363
/* End PBXFileReference section */
@@ -277,6 +277,7 @@
277277
13B07FB21A68108700A75B9A /* Base */,
278278
);
279279
name = LaunchScreen.xib;
280+
path = Movies;
280281
sourceTree = "<group>";
281282
};
282283
/* End PBXVariantGroup section */
@@ -291,7 +292,7 @@
291292
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
292293
"$(SRCROOT)/../../ReactKit/**",
293294
);
294-
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
295+
INFOPLIST_FILE = "$(SRCROOT)/Movies/Info.plist";
295296
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
296297
LIBRARY_SEARCH_PATHS = (
297298
"$(inherited)",
@@ -311,7 +312,7 @@
311312
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
312313
"$(SRCROOT)/../../ReactKit/**",
313314
);
314-
INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
315+
INFOPLIST_FILE = "$(SRCROOT)/Movies/Info.plist";
315316
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
316317
LIBRARY_SEARCH_PATHS = (
317318
"$(inherited)",

‎Examples/Movies/AppDelegate.h‎ renamed to ‎Examples/Movies/Movies/AppDelegate.h‎

File renamed without changes.

‎Examples/Movies/AppDelegate.m‎ renamed to ‎Examples/Movies/Movies/AppDelegate.m‎

File renamed without changes.

0 commit comments

Comments
 (0)