Skip to content

Commit 7ec7470

Browse files
committed
Updated dependencies (until Nimble gets SPM stable)
Updated build scripts Update Travis build matrix Cache Homebrew Travis Update Package.swift Update Package.swift Update .travis.yml Update Package.swift Fix minimum SPM version tool Test Rollback Rollback travis Exclude tvos Use master Update Fastfile
1 parent 0b75a6b commit 7ec7470

File tree

6 files changed

+80
-25
lines changed

6 files changed

+80
-25
lines changed

.travis.yml

Lines changed: 48 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,59 @@
11
language: swift
2-
osx_image: xcode11.3
32
if: tag is blank
43

54
cache:
65
bundler: true
76
cocoapods: true
8-
7+
directories:
8+
- $TRAVIS_BUILD_DIR/target
9+
# https://stackoverflow.com/questions/39930171/cache-brew-builds-with-travis-ci
10+
- $HOME/Library/Caches/Homebrew
11+
- /usr/local/Homebrew/
12+
# used in OSX custom build script dealing with local bottle caching
13+
- $HOME/local_bottle_metadata
914
addons:
1015
homebrew:
1116
brewfile: true
1217
update: true
1318

14-
script:
15-
- set -o pipefail
16-
- swift --version
17-
- rake
18-
- rake test
19-
- bundle exec fastlane pass_tests
20-
- bundle exec pod repo update
21-
- rake pods
22-
- bundle exec danger
19+
before_install: |
20+
if [ -n "$IS_OSX" ]; then
21+
TAPS="$(brew --repository)/Library/Taps"
22+
if [ -e "$TAPS/caskroom/homebrew-cask" -a -e "$TAPS/homebrew/homebrew-cask" ]; then
23+
rm -rf "$TAPS/caskroom/homebrew-cask"
24+
fi
25+
find "$TAPS" -type d -name .git -exec \
26+
bash -xec '
27+
cd $(dirname '\''{}'\'') || echo "status: $?"
28+
git clean -fxd || echo "status: $?"
29+
sleep 1 || echo "status: $?"
30+
git status || echo "status: $?"' \; || echo "status: $?"
31+
brew_cache_cleanup
32+
fi
33+
before_cache: |
34+
# Cleanup dirs to be cached
35+
set -e; set -x
36+
if [ -n "$IS_OSX" ]; then
37+
# When Taps is cached, this dir causes "Error: file exists" on `brew update`
38+
if [ -e "$(brew --repository)/Library/Taps/homebrew/homebrew-cask/homebrew-cask" ]; then
39+
rm -rf "$(brew --repository)/Library/Taps/homebrew/homebrew-cask/homebrew-cask"
40+
fi
41+
brew_cache_cleanup
42+
fi
43+
set +x; set +e
44+
45+
jobs:
46+
include:
47+
- stage: Continuous Integration Coverage
48+
name: SwiftPM macOS
49+
os: osx
50+
osx_image: xcode11.3
51+
before_script:
52+
- bundle install
53+
script:
54+
- set -o pipefail
55+
- rake
56+
- bundle exec fastlane pass_tests
57+
- bundle exec pod repo update
58+
- rake pods
59+
- bundle exec danger

Package.resolved

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,24 @@
1919
"version": "4.0.2"
2020
}
2121
},
22+
{
23+
"package": "CwlCatchException",
24+
"repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git",
25+
"state": {
26+
"branch": null,
27+
"revision": "f809deb30dc5c9d9b78c872e553261a61177721a",
28+
"version": "2.0.0"
29+
}
30+
},
31+
{
32+
"package": "CwlPreconditionTesting",
33+
"repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting",
34+
"state": {
35+
"branch": "master",
36+
"revision": "02b7a39a99c4da27abe03cab2053a9034379639f",
37+
"version": null
38+
}
39+
},
2240
{
2341
"package": "Komondor",
2442
"repositoryURL": "https://github.com/shibapm/Komondor.git",
@@ -57,11 +75,11 @@
5775
},
5876
{
5977
"package": "Nimble",
60-
"repositoryURL": "https://github.com/Quick/Nimble.git",
78+
"repositoryURL": "https://github.com/Quick/Nimble",
6179
"state": {
6280
"branch": null,
63-
"revision": "f8657642dfdec9973efc79cc68bcef43a653a2bc",
64-
"version": "8.0.2"
81+
"revision": "b02b00b30b6353632aa4a5fb6124f8147f7140c0",
82+
"version": "8.0.5"
6583
}
6684
},
6785
{

Package.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,11 @@ let package = Package(
3535
],
3636
dependencies: [
3737
// Dependencies declare other packages that this package depends on.
38-
.package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0"),
38+
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.0.0")),
3939
.package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.7.1")),
4040
// Development
41-
.package(url: "https://github.com/Quick/Nimble.git", .exact("8.0.2")), // dev
41+
.package(url: "https://github.com/Quick/Nimble", .branch("master")), // dev
42+
.package(url: "https://github.com/mattgallagher/CwlPreconditionTesting", .branch("master")), // dev
4243
.package(url: "https://github.com/minuscorp/ModuleInterface", from: "0.0.1"), // dev
4344
.package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.35.8"), // dev
4445
.package(url: "https://github.com/jpsim/SourceKitten", from: "0.26.0"), // dev
@@ -74,7 +75,7 @@ let package = Package(
7475
),
7576
.testTarget(name: "MiniSwiftTests", dependencies: ["Mini", "MiniTasks", "MiniPromises", "TestMiddleware", "NIOConcurrencyHelpers", "RxSwift", "Nimble", "RxTest", "RxBlocking"]), // dev
7677
],
77-
swiftLanguageVersions: [.version("4"), .version("4.2"), .version("5")]
78+
swiftLanguageVersions: [.version("5.1")]
7879
)
7980

8081
#if canImport(PackageConfig)

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ task(:setup) do
1818
end
1919

2020
task(:build) do
21-
sh('swift build --disable-sandbox -c release')
21+
sh("swift build --disable-sandbox -c release")
2222
end
2323

2424
task(:test) do

Tests/MiniSwiftTests/ActionTests.swift

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@ final class ActionTests: XCTestCase {
1414
XCTAssertEqual(String(describing: type(of: action)), SetCounterAction.tag)
1515
}
1616

17-
#if !SWIFT_PACKAGE
18-
func test_empty_action_fatal_error_initializer() {
19-
expect {
20-
_ = TasksTestEmptyAction(task: .success(), payload: nil)
21-
}.to(throwAssertion())
22-
}
23-
#endif
17+
func test_empty_action_fatal_error_initializer() {
18+
expect {
19+
_ = TasksTestEmptyAction(task: .success(), payload: nil)
20+
}.to(throwAssertion())
21+
}
2422
}

Tests/MiniSwiftTests/XCTestManifests.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// to regenerate.
88
static let __allTests__ActionTests = [
99
("test_action_tag", test_action_tag),
10+
("test_empty_action_fatal_error_initializer", test_empty_action_fatal_error_initializer),
1011
]
1112
}
1213

0 commit comments

Comments
 (0)