Skip to content

Commit b822484

Browse files
committed
Update Travis settings for Xcode 10
1 parent 0e8129c commit b822484

8 files changed

Lines changed: 45 additions & 23 deletions

File tree

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ env:
1010
- FRAMEWORK_NAME="ReSwiftRouter"
1111
- UPDATE_DOCS="false"
1212

13-
osx_image: xcode8.2
13+
osx_image: xcode10
1414

1515
matrix:
1616
include:
17-
- env: SCHEME="macOS" SDK="macosx10.12" DESTINATION="arch=x86_64"
18-
- env: SCHEME="iOS" SDK="iphonesimulator10.2" DESTINATION="OS=10.1,name=iPhone 6S Plus"
19-
- env: SCHEME="tvOS" SDK="appletvsimulator10.1" DESTINATION="OS=10.1,name=Apple TV 1080p"
17+
- env: SCHEME="macOS" SDK="macosx10.14" DESTINATION="arch=x86_64"
18+
- env: SCHEME="iOS" SDK="iphonesimulator12.0" DESTINATION="OS=12.0,name=iPhone X"
19+
- env: SCHEME="tvOS" SDK="appletvsimulator12.0" DESTINATION="OS=10.2,name=Apple TV 1080p"
2020

2121
before_install:
22-
- carthage bootstrap
22+
- carthage bootstrap --platform "$SCHEME" --verbose
2323

2424
script:
2525
- set -o pipefail

ReSwiftRouter.xcodeproj/project.pbxproj

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,7 @@
224224
25C0A9CB1C50AF6400139FA7 /* Router.swift */,
225225
625E66E21C2000620027C288 /* Frameworks */,
226226
);
227-
name = ReSwiftRouter;
228-
path = SwiftFlowRouter;
227+
path = ReSwiftRouter;
229228
sourceTree = "<group>";
230229
};
231230
625E66E21C2000620027C288 /* Frameworks */ = {
@@ -248,8 +247,7 @@
248247
254B3BAC1D3AD6DD00B1E4F0 /* RouteHashSpec.swift */,
249248
625E67001C2001F60027C288 /* Frameworks */,
250249
);
251-
name = ReSwiftRouterTests;
252-
path = SwiftFlowRouterTests;
250+
path = ReSwiftRouterTests;
253251
sourceTree = "<group>";
254252
};
255253
625E67001C2001F60027C288 /* Frameworks */ = {
@@ -503,7 +501,7 @@
503501
isa = PBXProject;
504502
attributes = {
505503
LastSwiftUpdateCheck = 0710;
506-
LastUpgradeCheck = 0810;
504+
LastUpgradeCheck = 1000;
507505
ORGANIZATIONNAME = "Benjamin Encz";
508506
TargetAttributes = {
509507
6209C04A1C54256F004E6B66 = {
@@ -528,11 +526,11 @@
528526
};
529527
625E66CC1C1FFE280027C288 = {
530528
CreatedOnToolsVersion = 7.1.1;
531-
LastSwiftMigration = 0800;
529+
LastSwiftMigration = 1000;
532530
};
533531
625E66F01C2000EA0027C288 = {
534532
CreatedOnToolsVersion = 7.1.1;
535-
LastSwiftMigration = 0800;
533+
LastSwiftMigration = 1000;
536534
};
537535
};
538536
};
@@ -1046,14 +1044,22 @@
10461044
CLANG_CXX_LIBRARY = "libc++";
10471045
CLANG_ENABLE_MODULES = YES;
10481046
CLANG_ENABLE_OBJC_ARC = YES;
1047+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
10491048
CLANG_WARN_BOOL_CONVERSION = YES;
1049+
CLANG_WARN_COMMA = YES;
10501050
CLANG_WARN_CONSTANT_CONVERSION = YES;
1051+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
10511052
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
10521053
CLANG_WARN_EMPTY_BODY = YES;
10531054
CLANG_WARN_ENUM_CONVERSION = YES;
10541055
CLANG_WARN_INFINITE_RECURSION = YES;
10551056
CLANG_WARN_INT_CONVERSION = YES;
1057+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1058+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
1059+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
10561060
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1061+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1062+
CLANG_WARN_STRICT_PROTOTYPES = YES;
10571063
CLANG_WARN_SUSPICIOUS_MOVE = YES;
10581064
CLANG_WARN_UNREACHABLE_CODE = YES;
10591065
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -1097,14 +1103,22 @@
10971103
CLANG_CXX_LIBRARY = "libc++";
10981104
CLANG_ENABLE_MODULES = YES;
10991105
CLANG_ENABLE_OBJC_ARC = YES;
1106+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
11001107
CLANG_WARN_BOOL_CONVERSION = YES;
1108+
CLANG_WARN_COMMA = YES;
11011109
CLANG_WARN_CONSTANT_CONVERSION = YES;
1110+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
11021111
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
11031112
CLANG_WARN_EMPTY_BODY = YES;
11041113
CLANG_WARN_ENUM_CONVERSION = YES;
11051114
CLANG_WARN_INFINITE_RECURSION = YES;
11061115
CLANG_WARN_INT_CONVERSION = YES;
1116+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1117+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
1118+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
11071119
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1120+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1121+
CLANG_WARN_STRICT_PROTOTYPES = YES;
11081122
CLANG_WARN_SUSPICIOUS_MOVE = YES;
11091123
CLANG_WARN_UNREACHABLE_CODE = YES;
11101124
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -1155,7 +1169,7 @@
11551169
PRODUCT_NAME = ReSwiftRouter;
11561170
SKIP_INSTALL = YES;
11571171
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1158-
SWIFT_VERSION = 3.0;
1172+
SWIFT_VERSION = 4.2;
11591173
};
11601174
name = Debug;
11611175
};
@@ -1179,7 +1193,7 @@
11791193
PRODUCT_BUNDLE_IDENTIFIER = "de.benjamin-encz.ReSwiftRouter";
11801194
PRODUCT_NAME = ReSwiftRouter;
11811195
SKIP_INSTALL = YES;
1182-
SWIFT_VERSION = 3.0;
1196+
SWIFT_VERSION = 4.2;
11831197
};
11841198
name = Release;
11851199
};
@@ -1194,7 +1208,7 @@
11941208
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
11951209
PRODUCT_BUNDLE_IDENTIFIER = "de.benjamin-encz.SwiftFlowRouterTests";
11961210
PRODUCT_NAME = "$(TARGET_NAME)";
1197-
SWIFT_VERSION = 3.0;
1211+
SWIFT_VERSION = 4.2;
11981212
};
11991213
name = Debug;
12001214
};
@@ -1209,7 +1223,7 @@
12091223
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
12101224
PRODUCT_BUNDLE_IDENTIFIER = "de.benjamin-encz.SwiftFlowRouterTests";
12111225
PRODUCT_NAME = "$(TARGET_NAME)";
1212-
SWIFT_VERSION = 3.0;
1226+
SWIFT_VERSION = 4.2;
12131227
};
12141228
name = Release;
12151229
};

ReSwiftRouter.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
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>

ReSwiftRouter.xcodeproj/xcshareddata/xcschemes/ReSwiftRouter-iOS.xcscheme

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0810"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,8 +26,8 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "YES"
30-
codeCoverageEnabled = "YES">
29+
codeCoverageEnabled = "YES"
30+
shouldUseLaunchSchemeArgsEnv = "YES">
3131
<Testables>
3232
<TestableReference
3333
skipped = "NO">

ReSwiftRouter.xcodeproj/xcshareddata/xcschemes/ReSwiftRouter-macOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0810"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

ReSwiftRouter.xcodeproj/xcshareddata/xcschemes/ReSwiftRouter-tvOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0810"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

ReSwiftRouter.xcodeproj/xcshareddata/xcschemes/ReSwiftRouter-watchOS.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0810"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)