Skip to content

Commit 1f20d9b

Browse files
modocachemodocache
authored
Merge pull request #176 from thaliproject/ios-target
Add watchOS, tvOS, iOS platforms support
2 parents cdfbf24 + cb30809 commit 1f20d9b

File tree

2 files changed

+49
-37
lines changed

2 files changed

+49
-37
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: 47 additions & 33 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,11 +407,16 @@
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;
413411
MTL_ENABLE_DEBUG_INFO = YES;
414412
ONLY_ACTIVE_ARCH = YES;
413+
PRODUCT_BUNDLE_IDENTIFIER = org.swift.XCTest;
414+
PRODUCT_BUNDLE_PACKAGE_TYPE = BNDL;
415+
PRODUCT_NAME = SwiftXCTest;
415416
SDKROOT = macosx;
417+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
416418
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
419+
SWIFT_VERSION = 3.0;
417420
VERSIONING_SYSTEM = "apple-generic";
418421
VERSION_INFO_PREFIX = "";
419422
};
@@ -440,7 +443,7 @@
440443
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
441444
CODE_SIGN_IDENTITY = "";
442445
COPY_PHASE_STRIP = NO;
443-
CURRENT_PROJECT_VERSION = 1;
446+
CURRENT_PROJECT_VERSION = 1.0;
444447
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
445448
ENABLE_NS_ASSERTIONS = NO;
446449
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -452,10 +455,14 @@
452455
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
453456
GCC_WARN_UNUSED_FUNCTION = YES;
454457
GCC_WARN_UNUSED_VARIABLE = YES;
455-
MACOSX_DEPLOYMENT_TARGET = 10.9;
458+
INFOPLIST_FILE = Info.plist;
456459
MTL_ENABLE_DEBUG_INFO = NO;
460+
PRODUCT_BUNDLE_IDENTIFIER = org.swift.XCTest;
461+
PRODUCT_BUNDLE_PACKAGE_TYPE = BNDL;
462+
PRODUCT_NAME = SwiftXCTest;
457463
SDKROOT = macosx;
458464
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
465+
SWIFT_VERSION = 3.0;
459466
VERSIONING_SYSTEM = "apple-generic";
460467
VERSION_INFO_PREFIX = "";
461468
};
@@ -464,45 +471,48 @@
464471
5B5D86E41BBC74AD00234F36 /* Debug */ = {
465472
isa = XCBuildConfiguration;
466473
buildSettings = {
467-
CLANG_ENABLE_MODULES = YES;
468-
COMBINE_HIDPI_IMAGES = YES;
469474
DEFINES_MODULE = YES;
470-
DYLIB_COMPATIBILITY_VERSION = 1;
471-
DYLIB_CURRENT_VERSION = 1;
472475
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";
476+
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = $BUILT_PRODUCTS_DIR;
477+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
478+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
479+
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks @loader_path/Frameworks";
477480
MACOSX_DEPLOYMENT_TARGET = 10.11;
478-
PRODUCT_BUNDLE_IDENTIFIER = org.swift.XCTest;
479-
PRODUCT_NAME = SwiftXCTest;
481+
"OTHER_LDFLAGS[sdk=macosx*]" = (
482+
"-framework",
483+
SwiftFoundation,
484+
);
485+
PRODUCT_BUNDLE_PACKAGE_TYPE = FMWK;
480486
SKIP_INSTALL = YES;
481-
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
482-
SWIFT_VERSION = 3.0;
487+
SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator";
488+
TARGETED_DEVICE_FAMILY = "1,2,3,4";
489+
TVOS_DEPLOYMENT_TARGET = 10.0;
483490
USER_HEADER_SEARCH_PATHS = $BUILT_PRODUCTS_DIR/usr/local/include/CoreFoundation;
491+
WATCHOS_DEPLOYMENT_TARGET = 3.0;
484492
};
485493
name = Debug;
486494
};
487495
5B5D86E51BBC74AD00234F36 /* Release */ = {
488496
isa = XCBuildConfiguration;
489497
buildSettings = {
490-
CLANG_ENABLE_MODULES = YES;
491-
COMBINE_HIDPI_IMAGES = YES;
492498
DEFINES_MODULE = YES;
493-
DYLIB_COMPATIBILITY_VERSION = 1;
494-
DYLIB_CURRENT_VERSION = 1;
495499
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+
"FRAMEWORK_SEARCH_PATHS[sdk=macosx*]" = $BUILT_PRODUCTS_DIR;
501+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
502+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
503+
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks @loader_path/Frameworks";
500504
MACOSX_DEPLOYMENT_TARGET = 10.11;
501-
PRODUCT_BUNDLE_IDENTIFIER = org.swift.XCTest;
502-
PRODUCT_NAME = SwiftXCTest;
505+
"OTHER_LDFLAGS[sdk=macosx*]" = (
506+
"-framework",
507+
SwiftFoundation,
508+
);
509+
PRODUCT_BUNDLE_PACKAGE_TYPE = FMWK;
503510
SKIP_INSTALL = YES;
504-
SWIFT_VERSION = 3.0;
511+
SUPPORTED_PLATFORMS = "appletvos appletvsimulator iphoneos iphonesimulator macosx watchos watchsimulator";
512+
TARGETED_DEVICE_FAMILY = "1,2,3,4";
513+
TVOS_DEPLOYMENT_TARGET = 10.0;
505514
USER_HEADER_SEARCH_PATHS = $BUILT_PRODUCTS_DIR/usr/local/include/CoreFoundation;
515+
WATCHOS_DEPLOYMENT_TARGET = 3.0;
506516
};
507517
name = Release;
508518
};
@@ -513,9 +523,11 @@
513523
DEBUG_INFORMATION_FORMAT = dwarf;
514524
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
515525
GCC_OPTIMIZATION_LEVEL = 0;
516-
MACOSX_DEPLOYMENT_TARGET = 10.11;
517526
OTHER_CFLAGS = "";
518-
OTHER_LDFLAGS = "";
527+
"OTHER_LDFLAGS[sdk=macosx*]" = (
528+
"-framework",
529+
SwiftFoundation,
530+
);
519531
PRODUCT_NAME = "$(TARGET_NAME)";
520532
SWIFT_EXEC = "$(TOOLCHAIN_DIR)/usr/bin/swiftc";
521533
};
@@ -525,9 +537,11 @@
525537
isa = XCBuildConfiguration;
526538
buildSettings = {
527539
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
528-
MACOSX_DEPLOYMENT_TARGET = 10.11;
529540
OTHER_CFLAGS = "";
530-
OTHER_LDFLAGS = "";
541+
"OTHER_LDFLAGS[sdk=macosx*]" = (
542+
"-framework",
543+
SwiftFoundation,
544+
);
531545
PRODUCT_NAME = "$(TARGET_NAME)";
532546
SWIFT_EXEC = "$(TOOLCHAIN_DIR)/usr/bin/swiftc";
533547
};

0 commit comments

Comments
 (0)