|
80 | 80 | /* End PBXContainerItemProxy section */
|
81 | 81 |
|
82 | 82 | /* Begin PBXFileReference section */
|
83 |
| - 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = ../node_modules/react-native-desktop/Libraries/Image/RCTImage.xcodeproj; sourceTree = "<group>"; }; |
84 |
| - 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = ../node_modules/react-native-desktop/Libraries/Network/RCTNetwork.xcodeproj; sourceTree = "<group>"; }; |
| 83 | + 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = "../node_modules/react-native-macos/Libraries/Image/RCTImage.xcodeproj"; sourceTree = "<group>"; }; |
| 84 | + 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = "../node_modules/react-native-macos/Libraries/Network/RCTNetwork.xcodeproj"; sourceTree = "<group>"; }; |
85 | 85 | 00E356EE1AD99517003FC87E /* MaterialColorsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MaterialColorsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
|
86 | 86 | 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
87 | 87 | 00E356F21AD99517003FC87E /* MaterialColorsTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MaterialColorsTests.m; sourceTree = "<group>"; };
|
88 |
| - 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = ../node_modules/react-native-desktop/Libraries/Settings/RCTSettings.xcodeproj; sourceTree = "<group>"; }; |
89 |
| - 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = ../node_modules/react-native-desktop/Libraries/WebSocket/RCTWebSocket.xcodeproj; sourceTree = "<group>"; }; |
| 88 | + 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native-macos/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = "<group>"; }; |
| 89 | + 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "../node_modules/react-native-macos/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = "<group>"; }; |
90 | 90 | 13B07F961A680F5B00A75B9A /* MaterialColors.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MaterialColors.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
91 | 91 | 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = MaterialColors/AppDelegate.h; sourceTree = "<group>"; };
|
92 | 92 | 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = MaterialColors/AppDelegate.m; sourceTree = "<group>"; };
|
93 | 93 | 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = MaterialColors/Images.xcassets; sourceTree = "<group>"; };
|
94 | 94 | 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = MaterialColors/Info.plist; sourceTree = "<group>"; };
|
95 | 95 | 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = MaterialColors/main.m; sourceTree = "<group>"; };
|
96 |
| - 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = ../node_modules/react-native-desktop/React/React.xcodeproj; sourceTree = "<group>"; }; |
97 |
| - 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = ../node_modules/react-native-desktop/Libraries/LinkingIOS/RCTLinking.xcodeproj; sourceTree = "<group>"; }; |
98 |
| - 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = ../node_modules/react-native-desktop/Libraries/Text/RCTText.xcodeproj; sourceTree = "<group>"; }; |
| 96 | + 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native-macos/React/React.xcodeproj"; sourceTree = "<group>"; }; |
| 97 | + 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native-macos/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; }; |
| 98 | + 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native-macos/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; }; |
99 | 99 | /* End PBXFileReference section */
|
100 | 100 |
|
101 | 101 | /* Begin PBXFrameworksBuildPhase section */
|
|
429 | 429 | );
|
430 | 430 | runOnlyForDeploymentPostprocessing = 0;
|
431 | 431 | shellPath = /bin/sh;
|
432 |
| - shellScript = "../node_modules/react-native-desktop/packager/react-native-xcode.sh"; |
433 |
| - showEnvVarsInLog = 1; |
| 432 | + shellScript = "../node_modules/react-native-macos/packager/react-native-xcode.sh"; |
434 | 433 | };
|
435 | 434 | /* End PBXShellScriptBuildPhase section */
|
436 | 435 |
|
|
467 | 466 | isa = XCBuildConfiguration;
|
468 | 467 | buildSettings = {
|
469 | 468 | BUNDLE_LOADER = "$(TEST_HOST)";
|
470 |
| - FRAMEWORK_SEARCH_PATHS = ( |
471 |
| - "$(inherited)", |
472 |
| - ); |
| 469 | + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; |
473 | 470 | GCC_PREPROCESSOR_DEFINITIONS = (
|
474 | 471 | "DEBUG=1",
|
475 | 472 | "$(inherited)",
|
476 | 473 | );
|
477 | 474 | INFOPLIST_FILE = MaterialColorsTests/Info.plist;
|
478 |
| - MACOSX_DEPLOYMENT_TARGET = 10.11; |
479 | 475 | LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
|
| 476 | + MACOSX_DEPLOYMENT_TARGET = 10.11; |
480 | 477 | PRODUCT_NAME = "$(TARGET_NAME)";
|
481 | 478 | TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MaterialColors.app/Contents/MacOS/MaterialColors";
|
482 | 479 | };
|
|
487 | 484 | buildSettings = {
|
488 | 485 | BUNDLE_LOADER = "$(TEST_HOST)";
|
489 | 486 | COPY_PHASE_STRIP = NO;
|
490 |
| - FRAMEWORK_SEARCH_PATHS = ( |
491 |
| - "$(inherited)", |
492 |
| - ); |
| 487 | + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; |
493 | 488 | INFOPLIST_FILE = MaterialColorsTests/Info.plist;
|
494 |
| - MACOSX_DEPLOYMENT_TARGET = 10.11; |
495 | 489 | LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
|
| 490 | + MACOSX_DEPLOYMENT_TARGET = 10.11; |
496 | 491 | PRODUCT_NAME = "$(TARGET_NAME)";
|
497 | 492 | TEST_HOST = "$(BUILT_PRODUCTS_DIR)/MaterialColors.app/Contents/MacOS/MaterialColors";
|
498 | 493 | };
|
|
506 | 501 | HEADER_SEARCH_PATHS = (
|
507 | 502 | "$(inherited)",
|
508 | 503 | /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
|
509 |
| - "$(SRCROOT)/../node_modules/react-native-desktop/React/**", |
| 504 | + "$(SRCROOT)/../node_modules/react-native-macos/React/**", |
510 | 505 | );
|
511 |
| - INFOPLIST_FILE = "MaterialColors/Info.plist"; |
| 506 | + INFOPLIST_FILE = MaterialColors/Info.plist; |
512 | 507 | LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
513 |
| - OTHER_LDFLAGS = "-ObjC"; |
| 508 | + OTHER_LDFLAGS = ( |
| 509 | + "-ObjC", |
| 510 | + "-lc++", |
| 511 | + ); |
| 512 | + PRODUCT_BUNDLE_IDENTIFIER = com.bafs.materialcolors; |
514 | 513 | PRODUCT_NAME = MaterialColors;
|
515 | 514 | };
|
516 | 515 | name = Debug;
|
|
522 | 521 | HEADER_SEARCH_PATHS = (
|
523 | 522 | "$(inherited)",
|
524 | 523 | /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
|
525 |
| - "$(SRCROOT)/../node_modules/react-native-desktop/React/**", |
| 524 | + "$(SRCROOT)/../node_modules/react-native-macos/React/**", |
526 | 525 | );
|
527 |
| - INFOPLIST_FILE = "MaterialColors/Info.plist"; |
| 526 | + INFOPLIST_FILE = MaterialColors/Info.plist; |
528 | 527 | LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
529 |
| - OTHER_LDFLAGS = "-ObjC"; |
| 528 | + OTHER_LDFLAGS = ( |
| 529 | + "-ObjC", |
| 530 | + "-lc++", |
| 531 | + ); |
| 532 | + PRODUCT_BUNDLE_IDENTIFIER = com.bafs.materialcolors; |
530 | 533 | PRODUCT_NAME = MaterialColors;
|
531 | 534 | };
|
532 | 535 | name = Release;
|
|
548 | 551 | CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
549 | 552 | CLANG_WARN_UNREACHABLE_CODE = YES;
|
550 | 553 | CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
551 |
| - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; |
| 554 | + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Mac Developer"; |
552 | 555 | COPY_PHASE_STRIP = NO;
|
553 | 556 | ENABLE_STRICT_OBJC_MSGSEND = YES;
|
554 | 557 | GCC_C_LANGUAGE_STANDARD = gnu99;
|
|
568 | 571 | HEADER_SEARCH_PATHS = (
|
569 | 572 | "$(inherited)",
|
570 | 573 | /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
|
571 |
| - "$(SRCROOT)/../node_modules/react-native-desktop/React/**", |
| 574 | + "$(SRCROOT)/../node_modules/react-native-macos/React/**", |
572 | 575 | );
|
573 | 576 | MACOSX_DEPLOYMENT_TARGET = 10.11;
|
574 | 577 | MTL_ENABLE_DEBUG_INFO = YES;
|
|
594 | 597 | CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
595 | 598 | CLANG_WARN_UNREACHABLE_CODE = YES;
|
596 | 599 | CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
597 |
| - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; |
| 600 | + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Mac Developer"; |
598 | 601 | COPY_PHASE_STRIP = YES;
|
599 | 602 | ENABLE_NS_ASSERTIONS = NO;
|
600 | 603 | ENABLE_STRICT_OBJC_MSGSEND = YES;
|
|
608 | 611 | HEADER_SEARCH_PATHS = (
|
609 | 612 | "$(inherited)",
|
610 | 613 | /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
|
611 |
| - "$(SRCROOT)/../node_modules/react-native-desktop/React/**", |
| 614 | + "$(SRCROOT)/../node_modules/react-native-macos/React/**", |
612 | 615 | );
|
613 | 616 | MACOSX_DEPLOYMENT_TARGET = 10.11;
|
614 | 617 | MTL_ENABLE_DEBUG_INFO = YES;
|
|
0 commit comments