Skip to content

Commit cb30809

Browse files
committed
Update Xcode project settings
- move SUPPORTED_PLATFORMS from project level to 'XCTest' target - move deployment targets from project level to 'XCTest' target - revert SDKROOT to macosx for project level
1 parent 7bb7faa commit cb30809

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

XCTest.xcodeproj/project.pbxproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -408,21 +408,17 @@
408408
GCC_WARN_UNUSED_FUNCTION = YES;
409409
GCC_WARN_UNUSED_VARIABLE = YES;
410410
INFOPLIST_FILE = Info.plist;
411-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
412-
MACOSX_DEPLOYMENT_TARGET = 10.11;
413411
MTL_ENABLE_DEBUG_INFO = YES;
414412
ONLY_ACTIVE_ARCH = YES;
415413
PRODUCT_BUNDLE_IDENTIFIER = org.swift.XCTest;
416414
PRODUCT_BUNDLE_PACKAGE_TYPE = BNDL;
417415
PRODUCT_NAME = SwiftXCTest;
418-
SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator";
416+
SDKROOT = macosx;
419417
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
420418
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
421419
SWIFT_VERSION = 3.0;
422-
TVOS_DEPLOYMENT_TARGET = 10.0;
423420
VERSIONING_SYSTEM = "apple-generic";
424421
VERSION_INFO_PREFIX = "";
425-
WATCHOS_DEPLOYMENT_TARGET = 3.0;
426422
};
427423
name = Debug;
428424
};
@@ -460,19 +456,15 @@
460456
GCC_WARN_UNUSED_FUNCTION = YES;
461457
GCC_WARN_UNUSED_VARIABLE = YES;
462458
INFOPLIST_FILE = Info.plist;
463-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
464-
MACOSX_DEPLOYMENT_TARGET = 10.11;
465459
MTL_ENABLE_DEBUG_INFO = NO;
466460
PRODUCT_BUNDLE_IDENTIFIER = org.swift.XCTest;
467461
PRODUCT_BUNDLE_PACKAGE_TYPE = BNDL;
468462
PRODUCT_NAME = SwiftXCTest;
469-
SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator";
463+
SDKROOT = macosx;
470464
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
471465
SWIFT_VERSION = 3.0;
472-
TVOS_DEPLOYMENT_TARGET = 10.0;
473466
VERSIONING_SYSTEM = "apple-generic";
474467
VERSION_INFO_PREFIX = "";
475-
WATCHOS_DEPLOYMENT_TARGET = 3.0;
476468
};
477469
name = Release;
478470
};
@@ -482,16 +474,21 @@
482474
DEFINES_MODULE = YES;
483475
DYLIB_INSTALL_NAME_BASE = "@rpath";
484476
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = $BUILT_PRODUCTS_DIR;
477+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
485478
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
486479
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks @loader_path/Frameworks";
480+
MACOSX_DEPLOYMENT_TARGET = 10.11;
487481
"OTHER_LDFLAGS[sdk=macosx*]" = (
488482
"-framework",
489483
SwiftFoundation,
490484
);
491485
PRODUCT_BUNDLE_PACKAGE_TYPE = FMWK;
492486
SKIP_INSTALL = YES;
487+
SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator";
493488
TARGETED_DEVICE_FAMILY = "1,2,3,4";
489+
TVOS_DEPLOYMENT_TARGET = 10.0;
494490
USER_HEADER_SEARCH_PATHS = $BUILT_PRODUCTS_DIR/usr/local/include/CoreFoundation;
491+
WATCHOS_DEPLOYMENT_TARGET = 3.0;
495492
};
496493
name = Debug;
497494
};
@@ -501,16 +498,21 @@
501498
DEFINES_MODULE = YES;
502499
DYLIB_INSTALL_NAME_BASE = "@rpath";
503500
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = $BUILT_PRODUCTS_DIR;
501+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
504502
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
505503
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks @loader_path/Frameworks";
504+
MACOSX_DEPLOYMENT_TARGET = 10.11;
506505
"OTHER_LDFLAGS[sdk=macosx*]" = (
507506
"-framework",
508507
SwiftFoundation,
509508
);
510509
PRODUCT_BUNDLE_PACKAGE_TYPE = FMWK;
511510
SKIP_INSTALL = YES;
511+
SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator";
512512
TARGETED_DEVICE_FAMILY = "1,2,3,4";
513+
TVOS_DEPLOYMENT_TARGET = 10.0;
513514
USER_HEADER_SEARCH_PATHS = $BUILT_PRODUCTS_DIR/usr/local/include/CoreFoundation;
515+
WATCHOS_DEPLOYMENT_TARGET = 3.0;
514516
};
515517
name = Release;
516518
};
@@ -527,7 +529,6 @@
527529
SwiftFoundation,
528530
);
529531
PRODUCT_NAME = "$(TARGET_NAME)";
530-
SDKROOT = macosx;
531532
SWIFT_EXEC = "$(TOOLCHAIN_DIR)/usr/bin/swiftc";
532533
};
533534
name = Debug;
@@ -542,7 +543,6 @@
542543
SwiftFoundation,
543544
);
544545
PRODUCT_NAME = "$(TARGET_NAME)";
545-
SDKROOT = macosx;
546546
SWIFT_EXEC = "$(TOOLCHAIN_DIR)/usr/bin/swiftc";
547547
};
548548
name = Release;

0 commit comments

Comments
 (0)