Skip to content

Commit 067fe98

Browse files
kishikawakatsumikishikawakatsumi
authored
Merge pull request bannzai#149 from kishikawakatsumi/xcode9
Update Xcode 9 recommendation settings
2 parents 5e6d520 + ca35949 commit 067fe98

File tree

19 files changed

+130
-46
lines changed

19 files changed

+130
-46
lines changed

‎.travis.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ jobs:
8484
- stage: 'test (xcode8.3)'
8585
osx_image: xcode8.3
8686
script:
87-
- bundle exec rake test:simulator DESTINATIONS="['name=iPhone 4s,OS=9.3']"
87+
- bundle exec rake test:simulator DESTINATIONS="['name=iPhone 4s,OS=9.3']" SWIFT_VERSION=3.0
8888
after_success:
8989
- bash <(curl -s https://codecov.io/bash) -f 'coverage.txt'
9090
- stage: 'test (xcode8.3)'
9191
osx_image: xcode8.3
9292
script:
93-
- bundle exec rake test:simulator DESTINATIONS="['name=iPhone 7,OS=10.3.1']"
93+
- bundle exec rake test:simulator DESTINATIONS="['name=iPhone 7,OS=10.3.1']" SWIFT_VERSION=3.0
9494
after_success:
9595
- bash <(curl -s https://codecov.io/bash) -f 'coverage.txt'
9696
- stage: carthage
@@ -106,7 +106,8 @@ jobs:
106106
- brew update
107107
- brew outdated carthage || brew upgrade carthage
108108
script:
109-
- carthage build --no-skip-current
109+
- echo SWIFT_VERSION=\"3.0\" > swift3.xcconfig
110+
- XCODE_XCCONFIG_FILE=`pwd`/swift3.xcconfig carthage build --no-skip-current
110111
env:
111112
global:
112113
- LANG=en_US.UTF-8

‎Examples/ClassData/ClassData.xcodeproj/project.pbxproj

+13-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
isa = PBXProject;
142142
attributes = {
143143
LastSwiftUpdateCheck = 0820;
144-
LastUpgradeCheck = 0820;
144+
LastUpgradeCheck = 0900;
145145
ORGANIZATIONNAME = "Kishikawa Katsumi";
146146
TargetAttributes = {
147147
149DC9391ECDB05200297E38 = {
@@ -225,15 +225,21 @@
225225
CLANG_CXX_LIBRARY = "libc++";
226226
CLANG_ENABLE_MODULES = YES;
227227
CLANG_ENABLE_OBJC_ARC = YES;
228+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
228229
CLANG_WARN_BOOL_CONVERSION = YES;
230+
CLANG_WARN_COMMA = YES;
229231
CLANG_WARN_CONSTANT_CONVERSION = YES;
230232
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
231233
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
232234
CLANG_WARN_EMPTY_BODY = YES;
233235
CLANG_WARN_ENUM_CONVERSION = YES;
234236
CLANG_WARN_INFINITE_RECURSION = YES;
235237
CLANG_WARN_INT_CONVERSION = YES;
238+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
239+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
236240
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
241+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
242+
CLANG_WARN_STRICT_PROTOTYPES = YES;
237243
CLANG_WARN_SUSPICIOUS_MOVE = YES;
238244
CLANG_WARN_UNREACHABLE_CODE = YES;
239245
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -274,15 +280,21 @@
274280
CLANG_CXX_LIBRARY = "libc++";
275281
CLANG_ENABLE_MODULES = YES;
276282
CLANG_ENABLE_OBJC_ARC = YES;
283+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
277284
CLANG_WARN_BOOL_CONVERSION = YES;
285+
CLANG_WARN_COMMA = YES;
278286
CLANG_WARN_CONSTANT_CONVERSION = YES;
279287
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
280288
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
281289
CLANG_WARN_EMPTY_BODY = YES;
282290
CLANG_WARN_ENUM_CONVERSION = YES;
283291
CLANG_WARN_INFINITE_RECURSION = YES;
284292
CLANG_WARN_INT_CONVERSION = YES;
293+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
294+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
285295
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
296+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
297+
CLANG_WARN_STRICT_PROTOTYPES = YES;
286298
CLANG_WARN_SUSPICIOUS_MOVE = YES;
287299
CLANG_WARN_UNREACHABLE_CODE = YES;
288300
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

‎Examples/ClassData/ClassData.xcodeproj/xcshareddata/xcschemes/ClassData.xcscheme

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -45,6 +46,7 @@
4546
buildConfiguration = "Debug"
4647
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4748
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49+
language = ""
4850
launchStyle = "0"
4951
useCustomWorkingDirectory = "NO"
5052
ignoresPersistentStateOnLaunch = "NO"

‎Examples/GanttChart/GanttChart.xcodeproj/project.pbxproj

+13-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
isa = PBXProject;
139139
attributes = {
140140
LastSwiftUpdateCheck = 0820;
141-
LastUpgradeCheck = 0820;
141+
LastUpgradeCheck = 0900;
142142
ORGANIZATIONNAME = "Kishikawa Katsumi";
143143
TargetAttributes = {
144144
1497BDF81EBFC054003186A3 = {
@@ -223,15 +223,21 @@
223223
CLANG_CXX_LIBRARY = "libc++";
224224
CLANG_ENABLE_MODULES = YES;
225225
CLANG_ENABLE_OBJC_ARC = YES;
226+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
226227
CLANG_WARN_BOOL_CONVERSION = YES;
228+
CLANG_WARN_COMMA = YES;
227229
CLANG_WARN_CONSTANT_CONVERSION = YES;
228230
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
229231
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
230232
CLANG_WARN_EMPTY_BODY = YES;
231233
CLANG_WARN_ENUM_CONVERSION = YES;
232234
CLANG_WARN_INFINITE_RECURSION = YES;
233235
CLANG_WARN_INT_CONVERSION = YES;
236+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
237+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
234238
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
239+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
240+
CLANG_WARN_STRICT_PROTOTYPES = YES;
235241
CLANG_WARN_SUSPICIOUS_MOVE = YES;
236242
CLANG_WARN_UNREACHABLE_CODE = YES;
237243
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -272,15 +278,21 @@
272278
CLANG_CXX_LIBRARY = "libc++";
273279
CLANG_ENABLE_MODULES = YES;
274280
CLANG_ENABLE_OBJC_ARC = YES;
281+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
275282
CLANG_WARN_BOOL_CONVERSION = YES;
283+
CLANG_WARN_COMMA = YES;
276284
CLANG_WARN_CONSTANT_CONVERSION = YES;
277285
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
278286
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
279287
CLANG_WARN_EMPTY_BODY = YES;
280288
CLANG_WARN_ENUM_CONVERSION = YES;
281289
CLANG_WARN_INFINITE_RECURSION = YES;
282290
CLANG_WARN_INT_CONVERSION = YES;
291+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
292+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
283293
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
294+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
295+
CLANG_WARN_STRICT_PROTOTYPES = YES;
284296
CLANG_WARN_SUSPICIOUS_MOVE = YES;
285297
CLANG_WARN_UNREACHABLE_CODE = YES;
286298
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

‎Examples/GanttChart/GanttChart.xcodeproj/xcshareddata/xcschemes/GanttChart.xcscheme

+3-1
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"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -45,6 +46,7 @@
4546
buildConfiguration = "Debug"
4647
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4748
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49+
language = ""
4850
launchStyle = "0"
4951
useCustomWorkingDirectory = "NO"
5052
ignoresPersistentStateOnLaunch = "NO"

‎Examples/Playground.playground/DataSource.o

12.8 KB
Binary file not shown.

‎Examples/Playground.playground/DebugCell.o

39.2 KB
Binary file not shown.

‎Examples/Schedule/Schedule.xcodeproj/project.pbxproj

+13-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
isa = PBXProject;
139139
attributes = {
140140
LastSwiftUpdateCheck = 0820;
141-
LastUpgradeCheck = 0820;
141+
LastUpgradeCheck = 0900;
142142
ORGANIZATIONNAME = "Kishikawa Katsumi";
143143
TargetAttributes = {
144144
146730A41EBF561C003CF620 = {
@@ -223,15 +223,21 @@
223223
CLANG_CXX_LIBRARY = "libc++";
224224
CLANG_ENABLE_MODULES = YES;
225225
CLANG_ENABLE_OBJC_ARC = YES;
226+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
226227
CLANG_WARN_BOOL_CONVERSION = YES;
228+
CLANG_WARN_COMMA = YES;
227229
CLANG_WARN_CONSTANT_CONVERSION = YES;
228230
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
229231
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
230232
CLANG_WARN_EMPTY_BODY = YES;
231233
CLANG_WARN_ENUM_CONVERSION = YES;
232234
CLANG_WARN_INFINITE_RECURSION = YES;
233235
CLANG_WARN_INT_CONVERSION = YES;
236+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
237+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
234238
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
239+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
240+
CLANG_WARN_STRICT_PROTOTYPES = YES;
235241
CLANG_WARN_SUSPICIOUS_MOVE = YES;
236242
CLANG_WARN_UNREACHABLE_CODE = YES;
237243
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -272,15 +278,21 @@
272278
CLANG_CXX_LIBRARY = "libc++";
273279
CLANG_ENABLE_MODULES = YES;
274280
CLANG_ENABLE_OBJC_ARC = YES;
281+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
275282
CLANG_WARN_BOOL_CONVERSION = YES;
283+
CLANG_WARN_COMMA = YES;
276284
CLANG_WARN_CONSTANT_CONVERSION = YES;
277285
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
278286
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
279287
CLANG_WARN_EMPTY_BODY = YES;
280288
CLANG_WARN_ENUM_CONVERSION = YES;
281289
CLANG_WARN_INFINITE_RECURSION = YES;
282290
CLANG_WARN_INT_CONVERSION = YES;
291+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
292+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
283293
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
294+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
295+
CLANG_WARN_STRICT_PROTOTYPES = YES;
284296
CLANG_WARN_SUSPICIOUS_MOVE = YES;
285297
CLANG_WARN_UNREACHABLE_CODE = YES;
286298
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

‎Examples/Schedule/Schedule.xcodeproj/xcshareddata/xcschemes/Schedule.xcscheme

+3-1
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"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -45,6 +46,7 @@
4546
buildConfiguration = "Debug"
4647
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4748
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49+
language = ""
4850
launchStyle = "0"
4951
useCustomWorkingDirectory = "NO"
5052
ignoresPersistentStateOnLaunch = "NO"

‎Examples/Timetable/Timetable.xcodeproj/project.pbxproj

+13-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
isa = PBXProject;
145145
attributes = {
146146
LastSwiftUpdateCheck = 0820;
147-
LastUpgradeCheck = 0820;
147+
LastUpgradeCheck = 0900;
148148
ORGANIZATIONNAME = "Kishikawa Katsumi";
149149
TargetAttributes = {
150150
140D6D0E1EC41F3500DFF8C1 = {
@@ -229,15 +229,21 @@
229229
CLANG_CXX_LIBRARY = "libc++";
230230
CLANG_ENABLE_MODULES = YES;
231231
CLANG_ENABLE_OBJC_ARC = YES;
232+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
232233
CLANG_WARN_BOOL_CONVERSION = YES;
234+
CLANG_WARN_COMMA = YES;
233235
CLANG_WARN_CONSTANT_CONVERSION = YES;
234236
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
235237
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
236238
CLANG_WARN_EMPTY_BODY = YES;
237239
CLANG_WARN_ENUM_CONVERSION = YES;
238240
CLANG_WARN_INFINITE_RECURSION = YES;
239241
CLANG_WARN_INT_CONVERSION = YES;
242+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
243+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
240244
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
245+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
246+
CLANG_WARN_STRICT_PROTOTYPES = YES;
241247
CLANG_WARN_SUSPICIOUS_MOVE = YES;
242248
CLANG_WARN_UNREACHABLE_CODE = YES;
243249
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -278,15 +284,21 @@
278284
CLANG_CXX_LIBRARY = "libc++";
279285
CLANG_ENABLE_MODULES = YES;
280286
CLANG_ENABLE_OBJC_ARC = YES;
287+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
281288
CLANG_WARN_BOOL_CONVERSION = YES;
289+
CLANG_WARN_COMMA = YES;
282290
CLANG_WARN_CONSTANT_CONVERSION = YES;
283291
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
284292
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
285293
CLANG_WARN_EMPTY_BODY = YES;
286294
CLANG_WARN_ENUM_CONVERSION = YES;
287295
CLANG_WARN_INFINITE_RECURSION = YES;
288296
CLANG_WARN_INT_CONVERSION = YES;
297+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
298+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
289299
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
300+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
301+
CLANG_WARN_STRICT_PROTOTYPES = YES;
290302
CLANG_WARN_SUSPICIOUS_MOVE = YES;
291303
CLANG_WARN_UNREACHABLE_CODE = YES;
292304
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

‎Examples/Timetable/Timetable.xcodeproj/xcshareddata/xcschemes/Timetable.xcscheme

+3-1
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"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -45,6 +46,7 @@
4546
buildConfiguration = "Debug"
4647
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4748
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49+
language = ""
4850
launchStyle = "0"
4951
useCustomWorkingDirectory = "NO"
5052
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)