Skip to content

Commit 7bb7faa

Browse files
larryonofflarryonoff
committed
Add iOS, tvOS, watchOS platforms support
'SwiftXCTest' is multi-platform single-scheme target now. Note that 'SwiftXCTestFunctionalTests' still only works on macOS and isn't planned to support other platforms.
1 parent 1879b06 commit 7bb7faa

File tree

2 files changed

+53
-41
lines changed

2 files changed

+53
-41
lines changed

‎Info.plist

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,14 @@
1313
<key>CFBundleName</key>
1414
<string>$(PRODUCT_NAME)</string>
1515
<key>CFBundlePackageType</key>
16-
<string>FMWK</string>
16+
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0</string>
18+
<string>$(CURRENT_PROJECT_VERSION)</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
2222
<string>$(CURRENT_PROJECT_VERSION)</string>
2323
<key>NSHumanReadableCopyright</key>
2424
<string>Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors</string>
25-
<key>NSPrincipalClass</key>
26-
<string></string>
2725
</dict>
2826
</plist>

‎XCTest.xcodeproj/project.pbxproj

Lines changed: 51 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
AE2FE11C1CFE86E6003EF0D7 /* XCTestCaseSuite.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE2FE1131CFE86E6003EF0D7 /* XCTestCaseSuite.swift */; };
3030
AE2FE11D1CFE86E6003EF0D7 /* XCTestInternalObservation.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE2FE1141CFE86E6003EF0D7 /* XCTestInternalObservation.swift */; };
3131
AE63767E1D01ED17002C0EA8 /* TestListing.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE63767D1D01ED17002C0EA8 /* TestListing.swift */; };
32-
DA7805FA1C6704A2003C6636 /* SwiftFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA7805F91C6704A2003C6636 /* SwiftFoundation.framework */; };
3332
DA9D44191D920A3500108768 /* XCNotificationExpectationHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9D44141D920A3500108768 /* XCNotificationExpectationHandler.swift */; };
3433
DA9D441A1D920A3500108768 /* XCPredicateExpectationHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9D44151D920A3500108768 /* XCPredicateExpectationHandler.swift */; };
3534
DA9D441B1D920A3500108768 /* XCTestCase+Asynchronous.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9D44161D920A3500108768 /* XCTestCase+Asynchronous.swift */; };
@@ -93,7 +92,6 @@
9392
isa = PBXFrameworksBuildPhase;
9493
buildActionMask = 2147483647;
9594
files = (
96-
DA7805FA1C6704A2003C6636 /* SwiftFoundation.framework in Frameworks */,
9795
);
9896
runOnlyForDeploymentPostprocessing = 0;
9997
};
@@ -391,7 +389,7 @@
391389
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
392390
CODE_SIGN_IDENTITY = "";
393391
COPY_PHASE_STRIP = NO;
394-
CURRENT_PROJECT_VERSION = 1;
392+
CURRENT_PROJECT_VERSION = 1.0;
395393
DEBUG_INFORMATION_FORMAT = dwarf;
396394
ENABLE_STRICT_OBJC_MSGSEND = YES;
397395
ENABLE_TESTABILITY = YES;
@@ -409,13 +407,22 @@
409407
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
410408
GCC_WARN_UNUSED_FUNCTION = YES;
411409
GCC_WARN_UNUSED_VARIABLE = YES;
412-
MACOSX_DEPLOYMENT_TARGET = 10.9;
410+
INFOPLIST_FILE = Info.plist;
411+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
412+
MACOSX_DEPLOYMENT_TARGET = 10.11;
413413
MTL_ENABLE_DEBUG_INFO = YES;
414414
ONLY_ACTIVE_ARCH = YES;
415-
SDKROOT = macosx;
415+
PRODUCT_BUNDLE_IDENTIFIER = org.swift.XCTest;
416+
PRODUCT_BUNDLE_PACKAGE_TYPE = BNDL;
417+
PRODUCT_NAME = SwiftXCTest;
418+
SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator";
419+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
416420
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
421+
SWIFT_VERSION = 3.0;
422+
TVOS_DEPLOYMENT_TARGET = 10.0;
417423
VERSIONING_SYSTEM = "apple-generic";
418424
VERSION_INFO_PREFIX = "";
425+
WATCHOS_DEPLOYMENT_TARGET = 3.0;
419426
};
420427
name = Debug;
421428
};
@@ -440,7 +447,7 @@
440447
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
441448
CODE_SIGN_IDENTITY = "";
442449
COPY_PHASE_STRIP = NO;
443-
CURRENT_PROJECT_VERSION = 1;
450+
CURRENT_PROJECT_VERSION = 1.0;
444451
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
445452
ENABLE_NS_ASSERTIONS = NO;
446453
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -452,56 +459,57 @@
452459
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
453460
GCC_WARN_UNUSED_FUNCTION = YES;
454461
GCC_WARN_UNUSED_VARIABLE = YES;
455-
MACOSX_DEPLOYMENT_TARGET = 10.9;
462+
INFOPLIST_FILE = Info.plist;
463+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
464+
MACOSX_DEPLOYMENT_TARGET = 10.11;
456465
MTL_ENABLE_DEBUG_INFO = NO;
457-
SDKROOT = macosx;
466+
PRODUCT_BUNDLE_IDENTIFIER = org.swift.XCTest;
467+
PRODUCT_BUNDLE_PACKAGE_TYPE = BNDL;
468+
PRODUCT_NAME = SwiftXCTest;
469+
SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator";
458470
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
471+
SWIFT_VERSION = 3.0;
472+
TVOS_DEPLOYMENT_TARGET = 10.0;
459473
VERSIONING_SYSTEM = "apple-generic";
460474
VERSION_INFO_PREFIX = "";
475+
WATCHOS_DEPLOYMENT_TARGET = 3.0;
461476
};
462477
name = Release;
463478
};
464479
5B5D86E41BBC74AD00234F36 /* Debug */ = {
465480
isa = XCBuildConfiguration;
466481
buildSettings = {
467-
CLANG_ENABLE_MODULES = YES;
468-
COMBINE_HIDPI_IMAGES = YES;
469482
DEFINES_MODULE = YES;
470-
DYLIB_COMPATIBILITY_VERSION = 1;
471-
DYLIB_CURRENT_VERSION = 1;
472483
DYLIB_INSTALL_NAME_BASE = "@rpath";
473-
FRAMEWORK_VERSION = A;
474-
INFOPLIST_FILE = Info.plist;
475-
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
476-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
477-
MACOSX_DEPLOYMENT_TARGET = 10.11;
478-
PRODUCT_BUNDLE_IDENTIFIER = org.swift.XCTest;
479-
PRODUCT_NAME = SwiftXCTest;
484+
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = $BUILT_PRODUCTS_DIR;
485+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
486+
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks @loader_path/Frameworks";
487+
"OTHER_LDFLAGS[sdk=macosx*]" = (
488+
"-framework",
489+
SwiftFoundation,
490+
);
491+
PRODUCT_BUNDLE_PACKAGE_TYPE = FMWK;
480492
SKIP_INSTALL = YES;
481-
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
482-
SWIFT_VERSION = 3.0;
493+
TARGETED_DEVICE_FAMILY = "1,2,3,4";
483494
USER_HEADER_SEARCH_PATHS = $BUILT_PRODUCTS_DIR/usr/local/include/CoreFoundation;
484495
};
485496
name = Debug;
486497
};
487498
5B5D86E51BBC74AD00234F36 /* Release */ = {
488499
isa = XCBuildConfiguration;
489500
buildSettings = {
490-
CLANG_ENABLE_MODULES = YES;
491-
COMBINE_HIDPI_IMAGES = YES;
492501
DEFINES_MODULE = YES;
493-
DYLIB_COMPATIBILITY_VERSION = 1;
494-
DYLIB_CURRENT_VERSION = 1;
495502
DYLIB_INSTALL_NAME_BASE = "@rpath";
496-
FRAMEWORK_VERSION = A;
497-
INFOPLIST_FILE = Info.plist;
498-
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
499-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
500-
MACOSX_DEPLOYMENT_TARGET = 10.11;
501-
PRODUCT_BUNDLE_IDENTIFIER = org.swift.XCTest;
502-
PRODUCT_NAME = SwiftXCTest;
503+
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = $BUILT_PRODUCTS_DIR;
504+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
505+
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks @loader_path/Frameworks";
506+
"OTHER_LDFLAGS[sdk=macosx*]" = (
507+
"-framework",
508+
SwiftFoundation,
509+
);
510+
PRODUCT_BUNDLE_PACKAGE_TYPE = FMWK;
503511
SKIP_INSTALL = YES;
504-
SWIFT_VERSION = 3.0;
512+
TARGETED_DEVICE_FAMILY = "1,2,3,4";
505513
USER_HEADER_SEARCH_PATHS = $BUILT_PRODUCTS_DIR/usr/local/include/CoreFoundation;
506514
};
507515
name = Release;
@@ -513,10 +521,13 @@
513521
DEBUG_INFORMATION_FORMAT = dwarf;
514522
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
515523
GCC_OPTIMIZATION_LEVEL = 0;
516-
MACOSX_DEPLOYMENT_TARGET = 10.11;
517524
OTHER_CFLAGS = "";
518-
OTHER_LDFLAGS = "";
525+
"OTHER_LDFLAGS[sdk=macosx*]" = (
526+
"-framework",
527+
SwiftFoundation,
528+
);
519529
PRODUCT_NAME = "$(TARGET_NAME)";
530+
SDKROOT = macosx;
520531
SWIFT_EXEC = "$(TOOLCHAIN_DIR)/usr/bin/swiftc";
521532
};
522533
name = Debug;
@@ -525,10 +536,13 @@
525536
isa = XCBuildConfiguration;
526537
buildSettings = {
527538
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
528-
MACOSX_DEPLOYMENT_TARGET = 10.11;
529539
OTHER_CFLAGS = "";
530-
OTHER_LDFLAGS = "";
540+
"OTHER_LDFLAGS[sdk=macosx*]" = (
541+
"-framework",
542+
SwiftFoundation,
543+
);
531544
PRODUCT_NAME = "$(TARGET_NAME)";
545+
SDKROOT = macosx;
532546
SWIFT_EXEC = "$(TOOLCHAIN_DIR)/usr/bin/swiftc";
533547
};
534548
name = Release;

0 commit comments

Comments
 (0)