Skip to content

Commit

Permalink
Feature/xcode 9 (#9)
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@gdj4ever @tmspzz
gdj4ever authored and tmspzz committed Dec 22, 2017
1 parent 1ffb3cc commit 218fb70
Show file tree
Hide file tree
Showing 12 changed files with 36 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode8.2
osx_image: xcode9.2
git:
submodules: false
before_install:
Expand All @@ -11,7 +11,7 @@ script:
- set -o pipefail
- xcodebuild test -scheme Tyro -configuration Debug | xcpretty -c
- xcodebuild test -scheme Tyro-iOS -configuration Debug -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 6s" | xcpretty -c
- xcodebuild test -scheme Tyro-tvOS -destination 'platform=tvOS Simulator,name=Apple TV 1080p' | xcpretty -c
- xcodebuild test -scheme Tyro-tvOS -destination 'platform=tvOS Simulator,name=Apple TV' | xcpretty -c
- xcodebuild build -scheme Tyro-watchOS -destination 'platform=watchOS Simulator,name=Apple Watch - 42mm' | xcpretty -c
# deploy:
# provider: script
Expand Down
2 changes: 1 addition & 1 deletion Cartfile.private
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "typelift/SwiftCheck" ~> 0.6.2
github "typelift/SwiftCheck" ~> 0.8.1
2 changes: 1 addition & 1 deletion Carthage/Checkouts/SwiftCheck
Submodule SwiftCheck updated 29 files
+1 −1 .swift-version
+8 −10 .travis.yml
+21 −20 README.md
+5 −5 Sources/Arbitrary.swift
+1 −1 Sources/CoArbitrary.swift
+27 −16 Sources/Gen.swift
+12 −7 Sources/Lattice.swift
+34 −9 Sources/Modifiers.swift
+2 −2 Sources/Property.swift
+20 −8 Sources/Random.swift
+13 −13 Sources/Rose.swift
+8 −6 Sources/Testable.swift
+5 −7 Sources/WitnessedArbitrary.swift
+1 −1 SwiftCheck.podspec
+23 −12 SwiftCheck.xcodeproj/project.pbxproj
+60 −37 Tests/SwiftCheckTests/BooleanIdentitySpec.swift
+48 −41 Tests/SwiftCheckTests/ComplexSpec.swift
+16 −11 Tests/SwiftCheckTests/DiscardSpec.swift
+1,212 −0 Tests/SwiftCheckTests/FileCheck.swift
+13 −8 Tests/SwiftCheckTests/FormatterSpec.swift
+359 −251 Tests/SwiftCheckTests/GenSpec.swift
+1 −1 Tests/SwiftCheckTests/LambdaSpec.swift
+62 −38 Tests/SwiftCheckTests/ModifierSpec.swift
+6 −6 Tests/SwiftCheckTests/PathSpec.swift
+157 −107 Tests/SwiftCheckTests/PropertySpec.swift
+33 −19 Tests/SwiftCheckTests/ShrinkSpec.swift
+84 −60 Tests/SwiftCheckTests/SimpleSpec.swift
+55 −35 Tests/SwiftCheckTests/TestSpec.swift
+11 −11 Tutorial.playground/Contents.swift
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Swiftz
Submodule Swiftz updated 6 files
+5 −5 .travis.yml
+1 −1 Cartfile.private
+2 −2 Cartfile.resolved
+1 −1 Carthage/Checkouts/SwiftCheck
+1 −1 Carthage/Checkouts/Swiftx
+4 −4 Sources/Bounded.swift
15 changes: 14 additions & 1 deletion Tyro.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0730;
LastUpgradeCheck = 0800;
LastUpgradeCheck = 0900;
ORGANIZATIONNAME = TypeLift;
TargetAttributes = {
823739711CC99B1400CBAF3C = {
Expand Down Expand Up @@ -1354,14 +1354,20 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -1406,14 +1412,20 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand All @@ -1434,6 +1446,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
Expand Down
4 changes: 3 additions & 1 deletion Tyro.xcodeproj/xcshareddata/xcschemes/Tyro-iOS.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,6 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<Testables>
Expand Down Expand Up @@ -56,6 +57,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
4 changes: 3 additions & 1 deletion Tyro.xcodeproj/xcshareddata/xcschemes/Tyro-tvOS.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,6 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
Expand Down Expand Up @@ -55,6 +56,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
4 changes: 3 additions & 1 deletion Tyro.xcodeproj/xcshareddata/xcschemes/Tyro-watchOS.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,6 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
Expand All @@ -36,6 +37,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
4 changes: 3 additions & 1 deletion Tyro.xcodeproj/xcshareddata/xcschemes/Tyro.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -26,6 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<Testables>
Expand Down Expand Up @@ -56,6 +57,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
2 changes: 1 addition & 1 deletion Tyro/Formatter.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public protocol JSONValueConvertible : JSONDecoderType {
var jsonValue : JSONValue? { get }
}

public protocol JSONFormatterType : JSONDecoderType, JSONEncoderType, JSONValueConvertible {
public protocol JSONFormatterType : JSONEncoderType, JSONValueConvertible {
associatedtype T
associatedtype EncodedType = T
associatedtype DecodedType = T
Expand Down
2 changes: 1 addition & 1 deletion Tyro/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.1.0</string>
<string>0.2.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
6 changes: 3 additions & 3 deletions Tyro/JSONOperators.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public func <! <A : FromJSON>(lhs : JSONValue?, rhs : JSONKeypath) throws -> A w
return result
}
else {
throw JSONError.Custom("Could not find value at keypath \(rhs) in JSONValue : \(lhs)")
throw JSONError.Custom("Could not find value at keypath \(rhs) in JSONValue : \(String(describing: lhs))")
}
}

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

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

0 comments on commit 218fb70

Please sign in to comment.