Skip to content

Commit

Permalink
Merge pull request Quick#711 from Quick/as-swift-4-swift-3-compat
Browse files Browse the repository at this point in the history
Enable Swift 3 compatibility mode under Swift 4
  • Loading branch information
modocache authored Jun 14, 2017
2 parents 7b5bc39 + 8250d93 commit 5f0b899
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
4 changes: 3 additions & 1 deletion .Package.test.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// swift-tools-version:3.0

import PackageDescription

let package = Package(
Expand All @@ -20,7 +22,7 @@ let package = Package(
// be `testDependencies:` instead. For now it has to be done like this for the library to get linked with the test targets.
// See: https://github.com/apple/swift-evolution/blob/master/proposals/0019-package-manager-testing.md
dependencies: [
.Package(url: "https://github.com/Quick/Nimble", majorVersion: 6)
.Package(url: "https://github.com/Quick/Nimble", majorVersion: 7)
],
exclude: {
var excludes = [
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
osx_image: xcode8.2
osx_image: xcode8.3
language: generic
matrix:
include:
Expand Down
2 changes: 1 addition & 1 deletion Externals/Nimble
Submodule Nimble updated 94 files
+3 −0 .swiftlint.yml
+1 −1 .travis.yml
+3 −0 Dockerfile.test
+1 −1 Gemfile
+25 −21 Gemfile.lock
+7 −5 Nimble.podspec
+224 −102 Nimble.xcodeproj/project.pbxproj
+1 −1 Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-iOS.xcscheme
+1 −1 Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-macOS.xcscheme
+1 −1 Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-tvOS.xcscheme
+5 −3 Package.swift
+504 −187 README.md
+0 −3 Sources/Lib/CwlPreconditionTesting/CwlCatchException/.gitignore
+9 −4 Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException.swift
+0 −28 Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/Info.plist
+2 −0 Sources/Lib/CwlPreconditionTesting/CwlCatchExceptionSupport/CwlCatchException.m
+2 −0 Sources/Lib/CwlPreconditionTesting/CwlCatchExceptionSupport/include/CwlCatchException.h
+50 −0 Sources/Lib/CwlPreconditionTesting/CwlMachBadInstructionHandler/CwlMachBadInstructionHandler.m
+15 −6 Sources/Lib/CwlPreconditionTesting/CwlMachBadInstructionHandler/include/CwlMachBadInstructionHandler.h
+5 −5 Sources/Lib/CwlPreconditionTesting/CwlMachBadInstructionHandler/mach_excServer.c
+23 −0 Sources/Lib/CwlPreconditionTesting/CwlMachBadInstructionHandler/mach_excServer.h
+28 −15 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlBadInstructionException.swift
+0 −50 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.m
+28 −22 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.swift
+78 −70 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstructionPOSIX.swift
+30 −38 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlDarwinDefinitions.swift
+0 −28 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/Info.plist
+30 −0 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/Mach/CwlPreconditionTesting.h
+27 −0 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/Posix/CwlPreconditionTesting.h
+80 −28 Sources/Nimble/Adapters/NMBExpectation.swift
+1 −1 Sources/Nimble/Adapters/NimbleEnvironment.swift
+6 −6 Sources/Nimble/DSL+Wait.swift
+65 −5 Sources/Nimble/Expectation.swift
+261 −0 Sources/Nimble/ExpectationMessage.swift
+29 −2 Sources/Nimble/FailureMessage.swift
+74 −48 Sources/Nimble/Matchers/AllPass.swift
+89 −4 Sources/Nimble/Matchers/AsyncMatcherWrapper.swift
+38 −18 Sources/Nimble/Matchers/BeAKindOf.swift
+27 −21 Sources/Nimble/Matchers/BeAnInstanceOf.swift
+23 −19 Sources/Nimble/Matchers/BeCloseTo.swift
+34 −33 Sources/Nimble/Matchers/BeEmpty.swift
+8 −8 Sources/Nimble/Matchers/BeGreaterThan.swift
+6 −6 Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift
+4 −4 Sources/Nimble/Matchers/BeIdenticalTo.swift
+6 −6 Sources/Nimble/Matchers/BeLessThan.swift
+6 −6 Sources/Nimble/Matchers/BeLessThanOrEqual.swift
+19 −25 Sources/Nimble/Matchers/BeLogical.swift
+3 −4 Sources/Nimble/Matchers/BeNil.swift
+2 −2 Sources/Nimble/Matchers/BeVoid.swift
+15 −18 Sources/Nimble/Matchers/BeginWith.swift
+16 −16 Sources/Nimble/Matchers/Contain.swift
+4 −4 Sources/Nimble/Matchers/ContainElementSatisfying.swift
+10 −10 Sources/Nimble/Matchers/EndWith.swift
+83 −44 Sources/Nimble/Matchers/Equal.swift
+5 −5 Sources/Nimble/Matchers/HaveCount.swift
+3 −3 Sources/Nimble/Matchers/Match.swift
+35 −8 Sources/Nimble/Matchers/MatchError.swift
+19 −3 Sources/Nimble/Matchers/MatcherFunc.swift
+17 −0 Sources/Nimble/Matchers/MatcherProtocols.swift
+3 −3 Sources/Nimble/Matchers/PostNotification.swift
+348 −0 Sources/Nimble/Matchers/Predicate.swift
+3 −3 Sources/Nimble/Matchers/RaisesException.swift
+73 −28 Sources/Nimble/Matchers/SatisfyAnyOf.swift
+2 −2 Sources/Nimble/Matchers/ThrowAssertion.swift
+211 −24 Sources/Nimble/Matchers/ThrowError.swift
+37 −0 Sources/Nimble/Matchers/ToSucceed.swift
+1 −6 Sources/Nimble/Nimble.h
+17 −18 Sources/Nimble/Utils/Async.swift
+3 −85 Sources/Nimble/Utils/Errors.swift
+2 −0 Sources/NimbleObjectiveC/DSL.h
+1 −1 Sources/NimbleObjectiveC/NMBStringify.h
+7 −9 Tests/NimbleTests/AsynchronousTest.swift
+11 −11 Tests/NimbleTests/Helpers/utils.swift
+2 −2 Tests/NimbleTests/Matchers/BeAnInstanceOfTest.swift
+14 −14 Tests/NimbleTests/Matchers/BeCloseToTest.swift
+4 −0 Tests/NimbleTests/Matchers/BeGreaterThanOrEqualToTest.swift
+3 −0 Tests/NimbleTests/Matchers/BeGreaterThanTest.swift
+4 −4 Tests/NimbleTests/Matchers/BeIdenticalToTest.swift
+4 −4 Tests/NimbleTests/Matchers/ContainTest.swift
+4 −2 Tests/NimbleTests/Matchers/EqualTest.swift
+1 −0 Tests/NimbleTests/Matchers/MatchErrorTest.swift
+1 −0 Tests/NimbleTests/Matchers/ThrowErrorTest.swift
+36 −0 Tests/NimbleTests/Matchers/ToSucceedTest.swift
+2 −2 Tests/NimbleTests/SynchronousTests.swift
+7 −7 Tests/NimbleTests/objc/ObjCAllPassTest.m
+4 −4 Tests/NimbleTests/objc/ObjCBeEmptyTest.m
+2 −0 Tests/NimbleTests/objc/ObjCBeGreaterThanOrEqualToTest.m
+5 −4 Tests/NimbleTests/objc/ObjCBeGreaterThanTest.m
+4 −4 Tests/NimbleTests/objc/ObjCBeLessThanTest.m
+2 −2 Tests/NimbleTests/objc/ObjCContainTest.m
+2 −2 Tests/NimbleTests/objc/ObjCEqualTest.m
+1 −1 Tests/NimbleTests/objc/ObjCRaiseExceptionTest.m
+2 −1 script/release
+23 −9 test
2 changes: 2 additions & 0 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// swift-tools-version:3.0

import PackageDescription

let package = Package(
Expand Down

0 comments on commit 5f0b899

Please sign in to comment.