Skip to content

Commit b73dfd5

Browse files
authored
Merge pull request #213 from ishkawa/xcode81
Update project settings for Xcode 8.1 and Swift 3.0.1
2 parents dca290a + 91c1378 commit b73dfd5

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

.swift-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0
1+
3.0.1

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ matrix:
66
include:
77
- os: osx
88
language: objective-c
9-
osx_image: xcode8
9+
osx_image: xcode8.1
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
@@ -16,7 +16,7 @@ matrix:
1616
- bash <(curl -s https://codecov.io/bash)
1717
- os: osx
1818
language: generic
19-
osx_image: xcode8
19+
osx_image: xcode8.1
2020
script:
2121
- swift build
2222
- swift test

APIKit.xcodeproj/project.pbxproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@
402402
isa = PBXProject;
403403
attributes = {
404404
LastSwiftUpdateCheck = 0730;
405-
LastUpgradeCheck = 0800;
405+
LastUpgradeCheck = 0810;
406406
ORGANIZATIONNAME = "Yosuke Ishikawa";
407407
TargetAttributes = {
408408
141F12161C1C9ABE0026D415 = {
@@ -562,6 +562,8 @@
562562
isa = XCBuildConfiguration;
563563
baseConfigurationReference = 141F12101C1C96820026D415 /* Debug.xcconfig */;
564564
buildSettings = {
565+
CLANG_WARN_INFINITE_RECURSION = YES;
566+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
565567
ENABLE_TESTABILITY = YES;
566568
GCC_NO_COMMON_BLOCKS = YES;
567569
ONLY_ACTIVE_ARCH = YES;
@@ -573,6 +575,8 @@
573575
isa = XCBuildConfiguration;
574576
baseConfigurationReference = 141F12111C1C96820026D415 /* Release.xcconfig */;
575577
buildSettings = {
578+
CLANG_WARN_INFINITE_RECURSION = YES;
579+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
576580
GCC_NO_COMMON_BLOCKS = YES;
577581
SWIFT_VERSION = 3.0;
578582
};

APIKit.xcodeproj/xcshareddata/xcschemes/APIKit.xcscheme

+1-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 = "0800"
3+
LastUpgradeVersion = "0810"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Tests/APIKitTests/SessionTests.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -238,12 +238,12 @@ class SessionTests: XCTestCase {
238238
return testSesssion
239239
}
240240

241-
private override func send<Request : APIKit.Request>(_ request: Request, callbackQueue: CallbackQueue?, handler: @escaping (Result<Request.Response, SessionTaskError>) -> Void) -> SessionTask? {
241+
override func send<Request : APIKit.Request>(_ request: Request, callbackQueue: CallbackQueue?, handler: @escaping (Result<Request.Response, SessionTaskError>) -> Void) -> SessionTask? {
242242
functionCallFlags[(#function)] = true
243243
return super.send(request)
244244
}
245245

246-
private override func cancelRequests<Request : APIKit.Request>(with requestType: Request.Type, passingTest test: @escaping (Request) -> Bool) {
246+
override func cancelRequests<Request : APIKit.Request>(with requestType: Request.Type, passingTest test: @escaping (Request) -> Bool) {
247247
functionCallFlags[(#function)] = true
248248
}
249249
}

0 commit comments

Comments
 (0)