Skip to content

Commit 218fb70

Browse files
gdj4evertmspzz
gdj4ever
authored and
tmspzz
committed
Feature/xcode 9 (#9)
* uses swift-develop branch for SwiftCheck framework, small adjustments * Ury fix (#8) * Fix Cartfile.private to include the correct SwiftCheck branch "swift-develop" no longer exists * Update SwiftCheck Submodule * Change Travis to us xcode9.1 * updates xcode version * updates tv os simulator * updates version in plist
1 parent 1ffb3cc commit 218fb70

12 files changed

+36
-15
lines changed

‎.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode8.2
2+
osx_image: xcode9.2
33
git:
44
submodules: false
55
before_install:
@@ -11,7 +11,7 @@ script:
1111
- set -o pipefail
1212
- xcodebuild test -scheme Tyro -configuration Debug | xcpretty -c
1313
- xcodebuild test -scheme Tyro-iOS -configuration Debug -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 6s" | xcpretty -c
14-
- xcodebuild test -scheme Tyro-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 1080p' | xcpretty -c
14+
- xcodebuild test -scheme Tyro-tvOS -destination 'platform=tvOS Simulator,name=Apple TV' | xcpretty -c
1515
- xcodebuild build -scheme Tyro-watchOS -destination 'platform=watchOS Simulator,name=Apple Watch - 42mm' | xcpretty -c
1616
# deploy:
1717
# provider: script

‎Cartfile.private

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "typelift/SwiftCheck" ~> 0.6.2
1+
github "typelift/SwiftCheck" ~> 0.8.1

‎Carthage/Checkouts/SwiftCheck

Submodule SwiftCheck updated 29 files

‎Carthage/Checkouts/Swiftz

‎Tyro.xcodeproj/project.pbxproj

+14-1
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,7 @@
766766
isa = PBXProject;
767767
attributes = {
768768
LastSwiftUpdateCheck = 0730;
769-
LastUpgradeCheck = 0800;
769+
LastUpgradeCheck = 0900;
770770
ORGANIZATIONNAME = TypeLift;
771771
TargetAttributes = {
772772
823739711CC99B1400CBAF3C = {
@@ -1354,14 +1354,20 @@
13541354
CLANG_CXX_LIBRARY = "libc++";
13551355
CLANG_ENABLE_MODULES = YES;
13561356
CLANG_ENABLE_OBJC_ARC = YES;
1357+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
13571358
CLANG_WARN_BOOL_CONVERSION = YES;
1359+
CLANG_WARN_COMMA = YES;
13581360
CLANG_WARN_CONSTANT_CONVERSION = YES;
13591361
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
13601362
CLANG_WARN_EMPTY_BODY = YES;
13611363
CLANG_WARN_ENUM_CONVERSION = YES;
13621364
CLANG_WARN_INFINITE_RECURSION = YES;
13631365
CLANG_WARN_INT_CONVERSION = YES;
1366+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1367+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
13641368
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1369+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1370+
CLANG_WARN_STRICT_PROTOTYPES = YES;
13651371
CLANG_WARN_SUSPICIOUS_MOVE = YES;
13661372
CLANG_WARN_UNREACHABLE_CODE = YES;
13671373
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -1406,14 +1412,20 @@
14061412
CLANG_CXX_LIBRARY = "libc++";
14071413
CLANG_ENABLE_MODULES = YES;
14081414
CLANG_ENABLE_OBJC_ARC = YES;
1415+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
14091416
CLANG_WARN_BOOL_CONVERSION = YES;
1417+
CLANG_WARN_COMMA = YES;
14101418
CLANG_WARN_CONSTANT_CONVERSION = YES;
14111419
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
14121420
CLANG_WARN_EMPTY_BODY = YES;
14131421
CLANG_WARN_ENUM_CONVERSION = YES;
14141422
CLANG_WARN_INFINITE_RECURSION = YES;
14151423
CLANG_WARN_INT_CONVERSION = YES;
1424+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1425+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
14161426
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1427+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1428+
CLANG_WARN_STRICT_PROTOTYPES = YES;
14171429
CLANG_WARN_SUSPICIOUS_MOVE = YES;
14181430
CLANG_WARN_UNREACHABLE_CODE = YES;
14191431
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -1434,6 +1446,7 @@
14341446
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
14351447
MTL_ENABLE_DEBUG_INFO = NO;
14361448
SDKROOT = iphoneos;
1449+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
14371450
SWIFT_VERSION = 3.0;
14381451
TARGETED_DEVICE_FAMILY = "1,2";
14391452
VALIDATE_PRODUCT = YES;

‎Tyro.xcodeproj/xcshareddata/xcschemes/Tyro-iOS.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 = "0800"
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
codeCoverageEnabled = "YES">
3132
<Testables>
@@ -56,6 +57,7 @@
5657
buildConfiguration = "Debug"
5758
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5859
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60+
language = ""
5961
launchStyle = "0"
6062
useCustomWorkingDirectory = "NO"
6163
ignoresPersistentStateOnLaunch = "NO"

‎Tyro.xcodeproj/xcshareddata/xcschemes/Tyro-tvOS.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 = "0800"
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
<TestableReference
@@ -55,6 +56,7 @@
5556
buildConfiguration = "Debug"
5657
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5758
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59+
language = ""
5860
launchStyle = "0"
5961
useCustomWorkingDirectory = "NO"
6062
ignoresPersistentStateOnLaunch = "NO"

‎Tyro.xcodeproj/xcshareddata/xcschemes/Tyro-watchOS.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 = "0800"
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>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

‎Tyro.xcodeproj/xcshareddata/xcschemes/Tyro.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 = "0800"
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
codeCoverageEnabled = "YES">
3132
<Testables>
@@ -56,6 +57,7 @@
5657
buildConfiguration = "Debug"
5758
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5859
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60+
language = ""
5961
launchStyle = "0"
6062
useCustomWorkingDirectory = "NO"
6163
ignoresPersistentStateOnLaunch = "NO"

‎Tyro/Formatter.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public protocol JSONValueConvertible : JSONDecoderType {
1313
var jsonValue : JSONValue? { get }
1414
}
1515

16-
public protocol JSONFormatterType : JSONDecoderType, JSONEncoderType, JSONValueConvertible {
16+
public protocol JSONFormatterType : JSONEncoderType, JSONValueConvertible {
1717
associatedtype T
1818
associatedtype EncodedType = T
1919
associatedtype DecodedType = T

‎Tyro/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.1.0</string>
18+
<string>0.2.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎Tyro/JSONOperators.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public func <! <A : FromJSON>(lhs : JSONValue?, rhs : JSONKeypath) throws -> A w
7272
return result
7373
}
7474
else {
75-
throw JSONError.Custom("Could not find value at keypath \(rhs) in JSONValue : \(lhs)")
75+
throw JSONError.Custom("Could not find value at keypath \(rhs) in JSONValue : \(String(describing: lhs))")
7676
}
7777
}
7878

@@ -81,7 +81,7 @@ public func <! <A : FromJSON>(lhs : JSONValue?, rhs : JSONKeypath) throws -> [A]
8181
return result
8282
}
8383
else {
84-
throw JSONError.Custom("Could not find value at keypath \(rhs) in JSONValue : \(lhs)")
84+
throw JSONError.Custom("Could not find value at keypath \(rhs) in JSONValue : \(String(describing: lhs))")
8585
}
8686
}
8787

@@ -90,6 +90,6 @@ public func <! <A : FromJSON>(lhs : JSONValue?, rhs : JSONKeypath) throws -> [St
9090
return result
9191
}
9292
else {
93-
throw JSONError.Custom("Could not find value at keypath \(rhs) in JSONValue : \(lhs)")
93+
throw JSONError.Custom("Could not find value at keypath \(rhs) in JSONValue : \(String(describing: lhs))")
9494
}
9595
}

0 commit comments

Comments
 (0)