Skip to content

Commit

Permalink
Merge pull request #94 from Carthage/swift-3.1
Browse files Browse the repository at this point in the history
Xcode 8.3 / SwiftPM 3.1
  • Loading branch information
mdiep authored Apr 29, 2017
2 parents 271311c + 4b197a9 commit 594f6d7
Show file tree
Hide file tree
Showing 11 changed files with 61 additions and 34 deletions.
11 changes: 0 additions & 11 deletions .Package.test.swift

This file was deleted.

6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### https://raw.github.com/github/gitignore/afbff9027d02ccfc680e031f6c295f79ad61662d/Swift.gitignore
### https://raw.github.com/github/gitignore/c0c1a480a906df0e023f3250cf2ad82f1612be67/Swift.gitignore

# Xcode
#
Expand All @@ -20,9 +20,8 @@ DerivedData/
xcuserdata/

## Other
*.xccheckout
*.moved-aside
*.xcuserstate
*.xccheckout
*.xcscmblueprint

## Obj-C/Swift specific
Expand All @@ -39,6 +38,7 @@ playground.xcworkspace
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
# Package.pins
.build/

# CocoaPods
Expand Down
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.2
3.1
12 changes: 3 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,22 @@
language: objective-c
xcode_workspace: ReactiveTask.xcworkspace
git:
submodules: false
branches:
only:
- master
matrix:
include:
- os: osx
osx_image: xcode8.2
osx_image: xcode8.3
xcode_scheme: ReactiveTask
before_script:
- git submodule update --init --recursive
script:
- set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" test | xcpretty
env: JOB=Xcode8
- os: osx
osx_image: xcode8.2
osx_image: xcode8.3
script:
- mv .Package.test.swift Package.swift
- swift package update
- cd Packages/Nimble-* && git checkout 8116a83864ee78339798c3ef425c42f6ca6bf034 && cd ../../
- swift build
- swift test
- SWIFTPM_TEST_ReactiveTask=YES swift test
env: JOB=SWIFTPM_DARWIN
notifications:
email: false
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "antitypical/Result" ~> 3.2
github "antitypical/Result" ~> 3.2.1
github "ReactiveCocoa/ReactiveSwift" ~> 1.1
2 changes: 1 addition & 1 deletion Cartfile.private
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "jspahrsummers/xcconfigs" "3d9d996"
github "Quick/Quick" ~> 1.1
github "Quick/Nimble" "8116a83864ee78339798c3ef425c42f6ca6bf034"
github "Quick/Nimble" ~> 6.1
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "Quick/Nimble" "8116a83864ee78339798c3ef425c42f6ca6bf034"
github "Quick/Nimble" "v6.1.0"
github "Quick/Quick" "v1.1.0"
github "ReactiveCocoa/ReactiveSwift" "1.1.0"
github "antitypical/Result" "3.2.0"
github "antitypical/Result" "3.2.1"
github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble updated 31 files
+3 −0 .swiftlint.yml
+3 −0 Dockerfile.test
+7 −5 Nimble.podspec
+188 −104 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
+0 −3 Sources/Lib/CwlPreconditionTesting/CwlCatchException/.gitignore
+0 −0 Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException.swift
+0 −28 Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException/Info.plist
+0 −0 Sources/Lib/CwlPreconditionTesting/CwlCatchExceptionSupport/CwlCatchException.m
+0 −0 Sources/Lib/CwlPreconditionTesting/CwlCatchExceptionSupport/include/CwlCatchException.h
+2 −1 Sources/Lib/CwlPreconditionTesting/CwlMachBadInstructionHandler/CwlMachBadInstructionHandler.m
+0 −5 Sources/Lib/CwlPreconditionTesting/CwlMachBadInstructionHandler/include/CwlMachBadInstructionHandler.h
+2 −2 Sources/Lib/CwlPreconditionTesting/CwlMachBadInstructionHandler/mach_excServer.c
+0 −0 Sources/Lib/CwlPreconditionTesting/CwlMachBadInstructionHandler/mach_excServer.h
+11 −11 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlBadInstructionException.swift
+23 −22 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.swift
+14 −17 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstructionPOSIX.swift
+5 −5 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlDarwinDefinitions.swift
+0 −25 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/Info.plist
+30 −0 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/Mach/CwlPreconditionTesting.h
+27 −0 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/Posix/CwlPreconditionTesting.h
+1 −6 Sources/Nimble/Nimble.h
+1 −5 Sources/Nimble/Utils/Errors.swift
+2 −0 Sources/NimbleObjectiveC/DSL.h
+4 −0 Tests/NimbleTests/Matchers/BeGreaterThanOrEqualToTest.swift
+3 −0 Tests/NimbleTests/Matchers/BeGreaterThanTest.swift
+2 −0 Tests/NimbleTests/objc/ObjCBeGreaterThanOrEqualToTest.m
+1 −0 Tests/NimbleTests/objc/ObjCBeGreaterThanTest.m
+21 −8 test
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Result
30 changes: 30 additions & 0 deletions Package.pins
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"autoPin": true,
"pins": [
{
"package": "Nimble",
"reason": null,
"repositoryURL": "https://github.com/Quick/Nimble.git",
"version": "6.1.0"
},
{
"package": "Quick",
"reason": null,
"repositoryURL": "https://github.com/Quick/Quick.git",
"version": "1.1.0"
},
{
"package": "ReactiveSwift",
"reason": null,
"repositoryURL": "https://github.com/ReactiveCocoa/ReactiveSwift.git",
"version": "1.1.1"
},
{
"package": "Result",
"reason": null,
"repositoryURL": "https://github.com/antitypical/Result.git",
"version": "3.2.1"
}
],
"version": 1
}
22 changes: 18 additions & 4 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
import Foundation
import PackageDescription

var isSwiftPackagerManagerTest: Bool {
return ProcessInfo.processInfo.environment["SWIFTPM_TEST_ReactiveTask"] == "YES"
}

let package = Package(
name: "ReactiveTask",
dependencies: [
.Package(url: "https://github.com/antitypical/Result.git", versions: Version(3, 2, 0)..<Version(3, .max, .max)),
.Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", versions: Version(1, 1, 0)..<Version(1, .max, .max)),
]
dependencies: {
var deps: [Package.Dependency] = [
.Package(url: "https://github.com/antitypical/Result.git", versions: Version(3, 2, 1)..<Version(3, .max, .max)),
.Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift.git", versions: Version(1, 1, 0)..<Version(1, .max, .max)),
]
if isSwiftPackagerManagerTest {
deps += [
.Package(url: "https://github.com/Quick/Quick.git", majorVersion: 1, minor: 1),
.Package(url: "https://github.com/Quick/Nimble.git", majorVersion: 6, minor: 1),
]
}
return deps
}()
)

0 comments on commit 594f6d7

Please sign in to comment.