Skip to content

Commit 151ee6e

Browse files
mxclmxcl
committed
Upgrade .xcodeproj to v9; CI all supported confs
1 parent fe9d7f2 commit 151ee6e

File tree

3 files changed

+61
-36
lines changed

3 files changed

+61
-36
lines changed

‎.travis.yml

Lines changed: 37 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,41 @@
1+
os: osx
12
language: objective-c
2-
osx_image: xcode8.3
33
matrix:
4-
include:
5-
- osx_image: xcode8
6-
- osx_image: xcode8.1
7-
- osx_image: xcode8.2
8-
- osx_image: xcode9
9-
env:
10-
- PLATFORM=Mac
11-
- PLATFORM=iOS NAME='iPhone SE'
12-
- PLATFORM=tvOS NAME='Apple TV 1080p'
13-
- PLATFORM=watchOS
14-
before_install:
15-
- if [ -n "$NAME" ]; then
16-
export UUID=$(instruments -s | ruby -e "ARGF.each_line{ |ln| ln =~ /$NAME .* \[(.*)\]/; if \$1; puts(\$1); exit; end }");
17-
fi
4+
include:
5+
- {osx_image: xcode8.2, env: 'PLAT=macOS SWFT=3.0 DST="arch:x86_64"'}
6+
- {osx_image: xcode8.2, env: 'PLAT=iOS SWFT=3.0 DST="OS=9.3,iPhone SE"'}
7+
- {osx_image: xcode8.2, env: 'PLAT=iOS SWFT=3.0 DST="OS=10.2,iPhone SE"'}
8+
- {osx_image: xcode8.2, env: 'PLAT=tvOS SWFT=3.0 DST="OS=9.2,Apple TV 1080p"'}
9+
- {osx_image: xcode8.2, env: 'PLAT=tvOS SWFT=3.0 DST="OS=10.1,Apple TV 1080p"'}
10+
- {osx_image: xcode8.2, env: 'PLAT=watchOS SWFT=3.0 DST="OS=3.1,name=Apple Watch - 38mm"'}
11+
12+
- {osx_image: xcode8.3, env: 'PLAT=macOS SWFT=3.1 DST="arch:x86_64"'}
13+
- {osx_image: xcode8.3, env: 'PLAT=iOS SWFT=3.0 DST="OS=9.3,iPhone SE"'}
14+
- {osx_image: xcode8.3, env: 'PLAT=iOS SWFT=3.1 DST="OS=10.3.1,iPhone SE"'}
15+
- {osx_image: xcode8.3, env: 'PLAT=tvOS SWFT=3.0 DST="OS=9.2,Apple TV 1080p"'}
16+
- {osx_image: xcode8.3, env: 'PLAT=tvOS SWFT=3.1 DST="OS=10.2,Apple TV 1080p"'}
17+
- {osx_image: xcode8.3, env: 'PLAT=watchOS SWFT=3.1 DST="OS=3.2,name=Apple Watch - 38mm"'}
18+
19+
- {osx_image: xcode9, env: 'PLAT=macOS SWFT=3.2 DST="arch:x86_64"'}
20+
- {osx_image: xcode9, env: 'PLAT=iOS SWFT=3.2 DST="OS=10.3.1,iPhone SE"'}
21+
- {osx_image: xcode9, env: 'PLAT=iOS SWFT=3.2 DST="OS=11.0,iPhone SE"'}
22+
- {osx_image: xcode9, env: 'PLAT=tvOS SWFT=3.2 DST="OS=10.2,Apple TV 1080p"'}
23+
- {osx_image: xcode9, env: 'PLAT=tvOS SWFT=3.2 DST="OS=11.0,Apple TV 1080p"'}
24+
- {osx_image: xcode9, env: 'PLAT=watchOS SWFT=3.2 DST="OS=3.2,name=Apple Watch - 38mm"'}
25+
- {osx_image: xcode9, env: 'PLAT=watchOS SWFT=3.2 DST="OS=4.0,name=Apple Watch - 38mm"'}
26+
27+
- {osx_image: xcode9, env: 'PLAT=macOS SWFT=4.0 DST="arch:x86_64"'}
28+
- {osx_image: xcode9, env: 'PLAT=iOS SWFT=4.0 DST="OS=10.3.1,iPhone SE"'}
29+
- {osx_image: xcode9, env: 'PLAT=iOS SWFT=4.0 DST="OS=11.0,iPhone SE"'}
30+
- {osx_image: xcode9, env: 'PLAT=tvOS SWFT=4.0 DST="OS=10.2,Apple TV 1080p"'}
31+
- {osx_image: xcode9, env: 'PLAT=tvOS SWFT=4.0 DST="OS=11.0,Apple TV 1080p"'}
32+
- {osx_image: xcode9, env: 'PLAT=watchOS SWFT=4.0 DST="OS=3.2,name=Apple Watch - 38mm"'}
33+
- {osx_image: xcode9, env: 'PLAT=watchOS SWFT=4.0 DST="OS=4.0,name=Apple Watch - 38mm"'}
1834
install:
19-
- carthage bootstrap --platform $PLATFORM
35+
- carthage bootstrap --platform $PLAT
2036
script:
21-
- set -o pipefail;
22-
case $PLATFORM in
23-
Mac)
24-
xcodebuild -scheme PMKCoreLocation test | xcpretty;;
25-
iOS|tvOS)
26-
open -a "simulator" --args -CurrentDeviceUDID "$UUID";
27-
xcodebuild -scheme PMKCoreLocation -destination "id=$UUID" test | xcpretty;;
28-
watchOS)
29-
xcodebuild -scheme PMKCoreLocation -destination "name=Apple Watch - 38mm" | xcpretty;;
30-
esac
37+
- set -o pipefail
38+
- xcodebuild -scheme PMKCoreLocation -quiet -destination "$DST" build SWIFT_VERSION=$SWFT
39+
- if [ "$PLAT" != "watchOS" ]; then
40+
xcodebuild -scheme PMKCoreLocation -quiet -destination "$DST" test;
41+
fi

‎PMKCoreLocation.xcodeproj/project.pbxproj

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,19 +97,17 @@
9797
63199F0A1D5FF25C007E8A0E /* CLLocationManager+AnyPromise.m */,
9898
63199F0B1D5FF25C007E8A0E /* CLLocationManager+Promise.swift */,
9999
);
100-
name = Sources;
101-
path = "PMK+UIKit";
102-
sourceTree = "<group>";
100+
path = Sources;
101+
sourceTree = SOURCE_ROOT;
103102
};
104103
63C7FFF31D5C020D003BAE60 /* Tests */ = {
105104
isa = PBXGroup;
106105
children = (
107106
63199F141D5FF7B9007E8A0E /* CLGeocoderTests.swift */,
108107
63199F151D5FF7B9007E8A0E /* CLLocationManagerTests.swift */,
109108
);
110-
name = Tests;
111-
path = PMKTests/NS;
112-
sourceTree = "<group>";
109+
path = Tests;
110+
sourceTree = SOURCE_ROOT;
113111
};
114112
/* End PBXGroup section */
115113

@@ -169,17 +167,17 @@
169167
isa = PBXProject;
170168
attributes = {
171169
LastSwiftUpdateCheck = 0800;
172-
LastUpgradeCheck = 0800;
170+
LastUpgradeCheck = 0900;
173171
ORGANIZATIONNAME = "Max Howell";
174172
TargetAttributes = {
175173
63C7FFA61D5BEE09003BAE60 = {
176174
CreatedOnToolsVersion = 8.0;
177-
LastSwiftMigration = 0800;
175+
LastSwiftMigration = 0900;
178176
ProvisioningStyle = Automatic;
179177
};
180178
63C7FFF11D5C020D003BAE60 = {
181179
CreatedOnToolsVersion = 8.0;
182-
LastSwiftMigration = 0800;
180+
LastSwiftMigration = 0900;
183181
ProvisioningStyle = Automatic;
184182
};
185183
};
@@ -262,15 +260,22 @@
262260
CLANG_CXX_LIBRARY = "libc++";
263261
CLANG_ENABLE_MODULES = YES;
264262
CLANG_ENABLE_OBJC_ARC = YES;
263+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
265264
CLANG_WARN_BOOL_CONVERSION = YES;
265+
CLANG_WARN_COMMA = YES;
266266
CLANG_WARN_CONSTANT_CONVERSION = YES;
267267
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
268268
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
269269
CLANG_WARN_EMPTY_BODY = YES;
270270
CLANG_WARN_ENUM_CONVERSION = YES;
271271
CLANG_WARN_INFINITE_RECURSION = YES;
272272
CLANG_WARN_INT_CONVERSION = YES;
273+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
274+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
273275
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
276+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
277+
CLANG_WARN_STRICT_PROTOTYPES = YES;
278+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
274279
CLANG_WARN_SUSPICIOUS_MOVES = YES;
275280
CLANG_WARN_UNREACHABLE_CODE = YES;
276281
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -319,15 +324,22 @@
319324
CLANG_CXX_LIBRARY = "libc++";
320325
CLANG_ENABLE_MODULES = YES;
321326
CLANG_ENABLE_OBJC_ARC = YES;
327+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
322328
CLANG_WARN_BOOL_CONVERSION = YES;
329+
CLANG_WARN_COMMA = YES;
323330
CLANG_WARN_CONSTANT_CONVERSION = YES;
324331
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
325332
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
326333
CLANG_WARN_EMPTY_BODY = YES;
327334
CLANG_WARN_ENUM_CONVERSION = YES;
328335
CLANG_WARN_INFINITE_RECURSION = YES;
329336
CLANG_WARN_INT_CONVERSION = YES;
337+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
338+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
330339
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
340+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
341+
CLANG_WARN_STRICT_PROTOTYPES = YES;
342+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
331343
CLANG_WARN_SUSPICIOUS_MOVES = YES;
332344
CLANG_WARN_UNREACHABLE_CODE = YES;
333345
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

‎PMKCoreLocation.xcodeproj/xcshareddata/xcschemes/PMKCoreLocation.xcscheme

Lines changed: 3 additions & 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 = "0800"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
language = ""
4344
shouldUseLaunchSchemeArgsEnv = "YES">
4445
<Testables>
4546
<TestableReference
@@ -69,6 +70,7 @@
6970
buildConfiguration = "Debug"
7071
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7172
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
73+
language = ""
7274
launchStyle = "0"
7375
useCustomWorkingDirectory = "NO"
7476
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)