Skip to content

Commit 27a96fb

Browse files
committed
Update to Swift 4.2 and test on Xcode 10
1 parent b8c3070 commit 27a96fb

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

.travis.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
1-
osx_image: xcode9.4
1+
os: osx
2+
osx_image: xcode10
23
language: swift
34
env:
45
global:
56
- LANG=en_US.UTF-8
67
- PROJECT="Differ.xcodeproj"
78
- SCHEME="Differ"
8-
- IOS_SDK=iphonesimulator11.4
9-
- OSX_SDK=macosx10.13
10-
- TVOS_SDK=appletvsimulator11.4
11-
- WATCHOS_SDK=watchsimulator4.3
9+
- IOS_SDK=iphonesimulator12.0
10+
- OSX_SDK=macosx10.14
11+
- TVOS_SDK=appletvsimulator12.0
12+
- WATCHOS_SDK=watchsimulator5.0
1213
matrix:
1314
- >-
1415
DESTINATION="arch=x86_64" SDK="$OSX_SDK" SCHEME="$SCHEME"
1516
RUN_TESTS="YES" BUILD_EXAMPLE="NO" POD_LINT="NO"
1617
- >-
17-
DESTINATION="OS=11.4,name=iPhone 7" SDK="$IOS_SDK" SCHEME="$SCHEME"
18+
DESTINATION="OS=12.0,name=iPhone 7" SDK="$IOS_SDK" SCHEME="$SCHEME"
1819
RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES"
1920
- >-
20-
DESTINATION="OS=11.4,name=Apple TV 4K" SDK="$TVOS_SDK"
21+
DESTINATION="OS=12.0,name=Apple TV 4K" SDK="$TVOS_SDK"
2122
SCHEME="$SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD_LINT="NO"
2223
- >-
23-
DESTINATION="OS=4.3,name=Apple Watch - 42mm" SDK="$WATCHOS_SDK"
24+
DESTINATION="OS=5.0,name=Apple Watch - 42mm" SDK="$WATCHOS_SDK"
2425
SCHEME="$SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="NO" POD_LINT="NO"
2526
script:
2627
- set -o pipefail

Differ.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@
351351
PRODUCT_BUNDLE_IDENTIFIER = "com.tonyarnold.$(TARGET_NAME:c99-identifier)";
352352
PRODUCT_NAME = "$(TARGET_NAME)";
353353
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
354-
SWIFT_VERSION = 4.0;
354+
SWIFT_VERSION = 4.2;
355355
TARGETED_DEVICE_FAMILY = "1,2";
356356
VERSIONING_SYSTEM = "apple-generic";
357357
VERSION_INFO_PREFIX = "";
@@ -373,7 +373,7 @@
373373
PRODUCT_BUNDLE_IDENTIFIER = "com.tonyarnold.$(TARGET_NAME:c99-identifier)";
374374
PRODUCT_NAME = "$(TARGET_NAME)";
375375
SWIFT_COMPILATION_MODE = wholemodule;
376-
SWIFT_VERSION = 4.0;
376+
SWIFT_VERSION = 4.2;
377377
TARGETED_DEVICE_FAMILY = "1,2";
378378
VALIDATE_PRODUCT = YES;
379379
VERSIONING_SYSTEM = "apple-generic";

Differ.xcodeproj/xcshareddata/xcschemes/Differ.xcscheme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
<TestableReference
32-
skipped = "NO">
32+
skipped = "NO"
33+
parallelizable = "YES"
34+
testExecutionOrdering = "random">
3335
<BuildableReference
3436
BuildableIdentifier = "primary"
3537
BlueprintIdentifier = "C9838FF01D29571000691BE8"

0 commit comments

Comments
 (0)