Skip to content

Commit 711243c

Browse files
committed
Update xcodeproj to v9
1 parent e734093 commit 711243c

File tree

3 files changed

+66
-24
lines changed

3 files changed

+66
-24
lines changed

.travis.yml

Lines changed: 44 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,57 @@
1+
os: osx
12
language: objective-c
2-
osx_image: xcode8.3
33
matrix:
44
include:
5-
- osx_image: xcode8
6-
- osx_image: xcode8.1
75
- osx_image: xcode8.2
6+
env: PLAT=macOS SWFT=3.0
7+
- osx_image: xcode8.2
8+
env: PLAT=iOS SWFT=3.0
9+
- osx_image: xcode8.2
10+
env: PLAT=tvOS SWFT=3.0
11+
- osx_image: xcode8.3
12+
env: PLAT=macOS SWFT=3.1
13+
- osx_image: xcode8.3
14+
env: PLAT=iOS SWFT=3.1
15+
- osx_image: xcode8.3
16+
env: PLAT=tvOS SWFT=3.1
17+
- osx_image: xcode9
18+
env: PLAT=macOS SWFT=3.2
19+
- osx_image: xcode9
20+
env: PLAT=iOS SWFT=3.2
21+
- osx_image: xcode9
22+
env: PLAT=tvOS SWFT=3.2
23+
- osx_image: xcode9
24+
env: PLAT=macOS SWFT=4.0
25+
- osx_image: xcode9
26+
env: PLAT=iOS SWFT=4.0
827
- osx_image: xcode9
9-
env:
10-
- PLATFORM=Mac
11-
- PLATFORM=iOS NAME='iPhone SE'
12-
- PLATFORM=tvOS NAME='Apple TV 1080p'
28+
env: PLAT=tvOS SWFT=4.0
1329
before_install:
14-
- if [ -n "$NAME" ]; then
30+
- case $PLAT in
31+
iOS)
32+
NAME="iPhone SE";;
33+
tvOS)
34+
NAME="Apple TV 1080p";;
35+
esac;
36+
if [ -n "$NAME" ]; then
1537
export UUID=$(instruments -s | ruby -e "ARGF.each_line{ |ln| ln =~ /$NAME .* \[(.*)\]/; if \$1; puts(\$1); exit; end }");
38+
export DESTINATION="id=$UUID";
1639
fi
1740
install:
18-
- carthage bootstrap --platform $PLATFORM
41+
- case $PLAT in
42+
macOS)
43+
carthage bootstrap --platform Mac;;
44+
tvOS|iOS)
45+
carthage bootstrap --platform $PLAT;;
46+
esac;
1947
script:
2048
- set -o pipefail;
21-
case $PLATFORM in
22-
Mac)
23-
xcodebuild -scheme PMKMapKit test | xcpretty;;
49+
case $PLAT in
50+
macOS)
51+
xcodebuild -scheme PMKMapKit -quiet build clean SWIFT_VERSION=$SWFT;
52+
xcodebuild -scheme PMKMapKit -quiet test;;
2453
iOS|tvOS)
25-
open -a "simulator" --args -CurrentDeviceUDID "$UUID";
26-
xcodebuild -scheme PMKMapKit -destination "id=$UUID" test | xcpretty;;
54+
open -b com.apple.iphonesimulator --args -CurrentDeviceUDID "$UUID";
55+
xcodebuild -scheme PMKMapKit -quiet -destination "$DESTINATION" build clean SWIFT_VERSION=$SWFT;
56+
xcodebuild -scheme PMKMapKit -quiet -destination "$DESTINATION" test;;
2757
esac

PMKMapKit.xcodeproj/project.pbxproj

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,18 +95,16 @@
9595
6358AB6F1D5D4B3A00B9B157 /* MKMapSnapshotter+AnyPromise.m */,
9696
6358AB701D5D4B3A00B9B157 /* MKMapSnapshotter+Promise.swift */,
9797
);
98-
name = Sources;
99-
path = "PMK+UIKit";
100-
sourceTree = "<group>";
98+
path = Sources;
99+
sourceTree = SOURCE_ROOT;
101100
};
102101
63C7FFF31D5C020D003BAE60 /* Tests */ = {
103102
isa = PBXGroup;
104103
children = (
105104
6358AB771D5D4B4700B9B157 /* TestMapKit.swift */,
106105
);
107-
name = Tests;
108-
path = PMKTests/NS;
109-
sourceTree = "<group>";
106+
path = Tests;
107+
sourceTree = SOURCE_ROOT;
110108
};
111109
/* End PBXGroup section */
112110

@@ -166,17 +164,17 @@
166164
isa = PBXProject;
167165
attributes = {
168166
LastSwiftUpdateCheck = 0800;
169-
LastUpgradeCheck = 0830;
167+
LastUpgradeCheck = 0900;
170168
ORGANIZATIONNAME = "Max Howell";
171169
TargetAttributes = {
172170
63C7FFA61D5BEE09003BAE60 = {
173171
CreatedOnToolsVersion = 8.0;
174-
LastSwiftMigration = 0800;
172+
LastSwiftMigration = 0900;
175173
ProvisioningStyle = Automatic;
176174
};
177175
63C7FFF11D5C020D003BAE60 = {
178176
CreatedOnToolsVersion = 8.0;
179-
LastSwiftMigration = 0800;
177+
LastSwiftMigration = 0900;
180178
ProvisioningStyle = Automatic;
181179
};
182180
};
@@ -258,15 +256,21 @@
258256
CLANG_CXX_LIBRARY = "libc++";
259257
CLANG_ENABLE_MODULES = YES;
260258
CLANG_ENABLE_OBJC_ARC = YES;
259+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
261260
CLANG_WARN_BOOL_CONVERSION = YES;
261+
CLANG_WARN_COMMA = YES;
262262
CLANG_WARN_CONSTANT_CONVERSION = YES;
263263
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
264264
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
265265
CLANG_WARN_EMPTY_BODY = YES;
266266
CLANG_WARN_ENUM_CONVERSION = YES;
267267
CLANG_WARN_INFINITE_RECURSION = YES;
268268
CLANG_WARN_INT_CONVERSION = YES;
269+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
270+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
269271
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
272+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
273+
CLANG_WARN_STRICT_PROTOTYPES = YES;
270274
CLANG_WARN_SUSPICIOUS_MOVE = YES;
271275
CLANG_WARN_SUSPICIOUS_MOVES = YES;
272276
CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -317,15 +321,21 @@
317321
CLANG_CXX_LIBRARY = "libc++";
318322
CLANG_ENABLE_MODULES = YES;
319323
CLANG_ENABLE_OBJC_ARC = YES;
324+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
320325
CLANG_WARN_BOOL_CONVERSION = YES;
326+
CLANG_WARN_COMMA = YES;
321327
CLANG_WARN_CONSTANT_CONVERSION = YES;
322328
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
323329
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
324330
CLANG_WARN_EMPTY_BODY = YES;
325331
CLANG_WARN_ENUM_CONVERSION = YES;
326332
CLANG_WARN_INFINITE_RECURSION = YES;
327333
CLANG_WARN_INT_CONVERSION = YES;
334+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
335+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
328336
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
337+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
338+
CLANG_WARN_STRICT_PROTOTYPES = YES;
329339
CLANG_WARN_SUSPICIOUS_MOVE = YES;
330340
CLANG_WARN_SUSPICIOUS_MOVES = YES;
331341
CLANG_WARN_UNREACHABLE_CODE = YES;

PMKMapKit.xcodeproj/xcshareddata/xcschemes/PMKMapKit.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 = "0830"
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)