Skip to content

Commit de16bbe

Browse files
mxclmxcl
committed
Bump travis platform versions & Cartfile.resolved
1 parent 1f8f066 commit de16bbe

5 files changed

Lines changed: 37 additions & 24 deletions

File tree

‎.travis.yml‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,33 @@ matrix:
1010
- {osx_image: xcode9.2, env: 'PLAT=iOS SWFT=3.2 DST="OS=11.2,name=iPhone SE"'}
1111
- {osx_image: xcode9.2, env: 'PLAT=tvOS SWFT=3.2 DST="OS=11.2,name=Apple TV"'}
1212

13-
- {osx_image: xcode9.3, env: 'PLAT=macOS SWFT=3.3 DST="arch=x86_64"'}
14-
- {osx_image: xcode9.3, env: 'PLAT=iOS SWFT=3.3 DST="OS=11.3,name=iPhone SE"'}
15-
- {osx_image: xcode9.3, env: 'PLAT=tvOS SWFT=3.3 DST="OS=11.3,name=Apple TV"'}
13+
- {osx_image: xcode9.4, env: 'PLAT=macOS SWFT=3.3 DST="arch=x86_64"'}
14+
- {osx_image: xcode9.4, env: 'PLAT=iOS SWFT=3.3 DST="OS=11.4,name=iPhone SE"'}
15+
- {osx_image: xcode9.4, env: 'PLAT=tvOS SWFT=3.3 DST="OS=11.4,name=Apple TV"'}
1616

1717
- {osx_image: xcode9.2, env: 'PLAT=macOS SWFT=4.0 DST="arch=x86_64"'}
1818
- {osx_image: xcode9.2, env: 'PLAT=iOS SWFT=4.0 DST="OS=11.2,name=iPhone SE"'}
1919
- {osx_image: xcode9.2, env: 'PLAT=tvOS SWFT=4.0 DST="OS=11.2,name=Apple TV"'}
2020

21-
# This variant fails reliably with Xcode 9.3, so sticking to Xcode 9.2 for now
22-
- {osx_image: xcode9.2, env: 'PLAT=iOS SWFT=4.0 DST="OS=8.4,name=iPhone 4s"'}
23-
24-
- {osx_image: xcode9.3, env: 'PLAT=macOS SWFT=4.1 DST="arch=x86_64"'}
25-
- {osx_image: xcode9.3, env: 'PLAT=iOS SWFT=4.1 DST="OS=9.3,name=iPhone SE"'}
26-
- {osx_image: xcode9.3, env: 'PLAT=iOS SWFT=4.1 DST="OS=10.3.1,name=iPhone SE"'}
27-
- {osx_image: xcode9.3, env: 'PLAT=iOS SWFT=4.1 DST="OS=11.2,name=iPhone SE"'}
21+
- {osx_image: xcode9.4, env: 'PLAT=macOS SWFT=4.1 DST="arch=x86_64" TEST=1'}
22+
- {osx_image: xcode9.4, env: 'PLAT=iOS SWFT=4.0 DST="OS=8.4,name=iPhone 4s"'}
23+
- {osx_image: xcode9.4, env: 'PLAT=iOS SWFT=4.1 DST="OS=9.3,name=iPhone 5s"'}
24+
- {osx_image: xcode9.4, env: 'PLAT=iOS SWFT=4.1 DST="OS=10.3.1,name=iPhone SE"'}
25+
- {osx_image: xcode9.4, env: 'PLAT=iOS SWFT=4.1 DST="OS=11.4,name=iPhone SE" TEST=1'}
2826
- {osx_image: xcode9.3, env: 'PLAT=tvOS SWFT=4.1 DST="OS=9.2,name=Apple TV 1080p"'}
2927
- {osx_image: xcode9.3, env: 'PLAT=tvOS SWFT=4.1 DST="OS=10.2,name=Apple TV 1080p"'}
30-
- {osx_image: xcode9.3, env: 'PLAT=tvOS SWFT=4.1 DST="OS=11.2,name=Apple TV"'}
28+
- {osx_image: xcode9.4, env: 'PLAT=tvOS SWFT=4.1 DST="OS=11.4,name=Apple TV" TEST=1'}
3129
cache:
3230
directories:
3331
- Carthage
3432
before_install:
3533
- carthage bootstrap --cache-builds --no-use-binaries --platform $PLAT --verbose
3634
install:
37-
- xcodebuild -scheme PMKStoreKit -quiet -destination "$DST" build-for-testing SWIFT_VERSION=$SWFT
35+
- xcodebuild -scheme PMKStoreKit -target PMKStoreKit -quiet -destination "$DST" build SWIFT_VERSION=$SWFT SWIFT_TREAT_WARNINGS_AS_ERRORS=YES
36+
- if [[ $TEST == "1" ]]; then
37+
xcodebuild -scheme PMKStoreKit -target PMKSKTests -quiet -destination "$DST" build;
38+
fi
3839
script:
39-
- xcodebuild -scheme PMKStoreKit -quiet -destination "$DST" test
40+
- if [[ $TEST == "1" ]]; then
41+
xcodebuild -scheme PMKStoreKit -quiet -destination "$DST" test;
42+
fi

‎Cartfile.resolved‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "mxcl/PromiseKit" "6.1.0"
1+
github "mxcl/PromiseKit" "6.3.3"

‎PMKStoreKit.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
isa = PBXProject;
164164
attributes = {
165165
LastSwiftUpdateCheck = 0800;
166-
LastUpgradeCheck = 0900;
166+
LastUpgradeCheck = 1000;
167167
ORGANIZATIONNAME = "Max Howell";
168168
TargetAttributes = {
169169
63C7FFA61D5BEE09003BAE60 = {
@@ -260,13 +260,15 @@
260260
CLANG_WARN_BOOL_CONVERSION = YES;
261261
CLANG_WARN_COMMA = YES;
262262
CLANG_WARN_CONSTANT_CONVERSION = YES;
263+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
263264
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
264265
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
265266
CLANG_WARN_EMPTY_BODY = YES;
266267
CLANG_WARN_ENUM_CONVERSION = YES;
267268
CLANG_WARN_INFINITE_RECURSION = YES;
268269
CLANG_WARN_INT_CONVERSION = YES;
269270
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
271+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
270272
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
271273
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
272274
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -303,6 +305,7 @@
303305
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos macosx";
304306
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
305307
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
308+
SWIFT_VERSION = 3.0;
306309
TARGETED_DEVICE_FAMILY = "1,2,3,4";
307310
TVOS_DEPLOYMENT_TARGET = 9.0;
308311
VERSIONING_SYSTEM = "apple-generic";
@@ -325,13 +328,15 @@
325328
CLANG_WARN_BOOL_CONVERSION = YES;
326329
CLANG_WARN_COMMA = YES;
327330
CLANG_WARN_CONSTANT_CONVERSION = YES;
331+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
328332
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
329333
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
330334
CLANG_WARN_EMPTY_BODY = YES;
331335
CLANG_WARN_ENUM_CONVERSION = YES;
332336
CLANG_WARN_INFINITE_RECURSION = YES;
333337
CLANG_WARN_INT_CONVERSION = YES;
334338
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
339+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
335340
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
336341
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
337342
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -360,6 +365,7 @@
360365
PRODUCT_BUNDLE_IDENTIFIER = org.promisekit.StoreKit;
361366
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos appletvsimulator appletvos macosx";
362367
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
368+
SWIFT_VERSION = 3.0;
363369
TARGETED_DEVICE_FAMILY = "1,2,3,4";
364370
TVOS_DEPLOYMENT_TARGET = 9.0;
365371
VALIDATE_PRODUCT = YES;
@@ -383,7 +389,6 @@
383389
PRODUCT_MODULE_NAME = "${TARGET_NAME}";
384390
PRODUCT_NAME = "$(TARGET_NAME)";
385391
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
386-
SWIFT_VERSION = 3.0;
387392
};
388393
name = Debug;
389394
};
@@ -400,7 +405,6 @@
400405
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
401406
PRODUCT_MODULE_NAME = "${TARGET_NAME}";
402407
PRODUCT_NAME = "$(TARGET_NAME)";
403-
SWIFT_VERSION = 3.0;
404408
};
405409
name = Release;
406410
};
@@ -414,7 +418,7 @@
414418
PRODUCT_NAME = "$(TARGET_NAME)";
415419
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
416420
SWIFT_SUPPRESS_WARNINGS = YES;
417-
SWIFT_VERSION = 3.0;
421+
SWIFT_VERSION = 4.0;
418422
};
419423
name = Debug;
420424
};
@@ -427,7 +431,7 @@
427431
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
428432
PRODUCT_NAME = "$(TARGET_NAME)";
429433
SWIFT_SUPPRESS_WARNINGS = YES;
430-
SWIFT_VERSION = 3.0;
434+
SWIFT_VERSION = 4.0;
431435
};
432436
name = Release;
433437
};

‎PMKStoreKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎PMKStoreKit.xcodeproj/xcshareddata/xcschemes/PMKStoreKit.xcscheme‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
7-
buildImplicitDependencies = "YES">
7+
buildImplicitDependencies = "NO">
88
<BuildActionEntries>
99
<BuildActionEntry
10-
buildForTesting = "YES"
10+
buildForTesting = "NO"
1111
buildForRunning = "YES"
1212
buildForProfiling = "YES"
1313
buildForArchiving = "YES"
@@ -40,7 +40,6 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
language = ""
4443
shouldUseLaunchSchemeArgsEnv = "YES">
4544
<Testables>
4645
<TestableReference
@@ -70,7 +69,6 @@
7069
buildConfiguration = "Debug"
7170
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7271
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
73-
language = ""
7472
launchStyle = "0"
7573
useCustomWorkingDirectory = "NO"
7674
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)