Skip to content

Commit e5724dc

Browse files
authored
Merge pull request #257 from ishkawa/xcode-9.3
Update project settings for Xcode 9.3
2 parents c93fc5d + 087bd71 commit e5724dc

5 files changed

Lines changed: 36 additions & 10 deletions

File tree

.travis.yml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,33 @@ matrix:
66
include:
77
- os: osx
88
language: objective-c
9-
osx_image: xcode9
9+
osx_image: xcode9.2
1010
script:
1111
- set -o pipefail
1212
- xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release ENABLE_TESTABILITY=YES | xcpretty -c
1313
- xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release -sdk iphonesimulator -destination "name=iPhone 6s" ENABLE_TESTABILITY=YES | xcpretty -c
14-
- xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release -sdk appletvsimulator -destination "name=Apple TV 1080p" ENABLE_TESTABILITY=YES | xcpretty -c
14+
- xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release -sdk appletvsimulator -destination "name=Apple TV" ENABLE_TESTABILITY=YES | xcpretty -c
1515
after_success:
1616
- bash <(curl -s https://codecov.io/bash)
17+
- os: osx
18+
language: objective-c
19+
osx_image: xcode9.3
20+
script:
21+
- set -o pipefail
22+
- xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release ENABLE_TESTABILITY=YES | xcpretty -c
23+
- xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release -sdk iphonesimulator -destination "name=iPhone 6s" ENABLE_TESTABILITY=YES | xcpretty -c
24+
- xcodebuild build-for-testing test-without-building -workspace APIKit.xcworkspace -scheme APIKit -configuration Release -sdk appletvsimulator -destination "name=Apple TV" ENABLE_TESTABILITY=YES | xcpretty -c
25+
after_success:
26+
- bash <(curl -s https://codecov.io/bash)
27+
- os: osx
28+
language: generic
29+
osx_image: xcode9.2
30+
script:
31+
- swift build
32+
- swift test
1733
- os: osx
1834
language: generic
19-
osx_image: xcode9
35+
osx_image: xcode9.3
2036
script:
2137
- swift build
2238
- swift test

APIKit.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
2323
:tag => "#{s.version}",
2424
}
2525

26-
s.pod_target_xcconfig = { "SWIFT_VERSION" => "4.0" }
26+
s.swift_version = "4.0"
2727

2828
s.license = {
2929
:type => "MIT",

APIKit.xcodeproj/project.pbxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@
402402
isa = PBXProject;
403403
attributes = {
404404
LastSwiftUpdateCheck = 0730;
405-
LastUpgradeCheck = 0900;
405+
LastUpgradeCheck = 0930;
406406
ORGANIZATIONNAME = "Yosuke Ishikawa";
407407
TargetAttributes = {
408408
141F12161C1C9ABE0026D415 = {
@@ -564,8 +564,10 @@
564564
buildSettings = {
565565
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
566566
CLANG_WARN_COMMA = YES;
567+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
567568
CLANG_WARN_INFINITE_RECURSION = YES;
568569
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
570+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
569571
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
570572
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
571573
CLANG_WARN_STRICT_PROTOTYPES = YES;
@@ -583,8 +585,10 @@
583585
buildSettings = {
584586
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
585587
CLANG_WARN_COMMA = YES;
588+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
586589
CLANG_WARN_INFINITE_RECURSION = YES;
587590
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
591+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
588592
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
589593
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
590594
CLANG_WARN_STRICT_PROTOTYPES = YES;

APIKit.xcodeproj/xcshareddata/xcschemes/APIKit.xcscheme

Lines changed: 3 additions & 5 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 = "0900"
3+
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,9 +40,8 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43-
language = ""
44-
shouldUseLaunchSchemeArgsEnv = "YES"
45-
codeCoverageEnabled = "YES">
43+
codeCoverageEnabled = "YES"
44+
shouldUseLaunchSchemeArgsEnv = "YES">
4645
<Testables>
4746
<TestableReference
4847
skipped = "NO">
@@ -71,7 +70,6 @@
7170
buildConfiguration = "Debug"
7271
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7372
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
74-
language = ""
7573
launchStyle = "0"
7674
useCustomWorkingDirectory = "NO"
7775
ignoresPersistentStateOnLaunch = "NO"
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>

0 commit comments

Comments
 (0)