From 9d6a3e28dda64af2ae8b1bc91ef2098415692b1d Mon Sep 17 00:00:00 2001 From: Sho Ikeda Date: Sun, 3 Mar 2019 21:16:55 +0900 Subject: [PATCH 1/3] Update Quick to 2.0.0 and Nimble to 8.0.0 --- Cartfile.private | 4 ++-- Cartfile.resolved | 4 ++-- Carthage/Checkouts/Nimble | 2 +- Carthage/Checkouts/Quick | 2 +- Package.resolved | 8 ++++---- Package.swift | 4 ++-- Package@swift-4.2.swift | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Cartfile.private b/Cartfile.private index d4d05b7d1..949d8a769 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,3 +1,3 @@ github "jspahrsummers/xcconfigs" == 0.12 -github "Quick/Quick" ~> 1.3.4 -github "Quick/Nimble" ~> 7.3.3 +github "Quick/Quick" ~> 2.0.0 +github "Quick/Nimble" ~> 8.0.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 02c1b7f68..c2de7e90e 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,4 @@ -github "Quick/Nimble" "v7.3.3" -github "Quick/Quick" "v1.3.4" +github "Quick/Nimble" "v8.0.0" +github "Quick/Quick" "v2.0.0" github "antitypical/Result" "4.1.0" github "jspahrsummers/xcconfigs" "0.12" diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble index 9a281b1cf..a27c5186c 160000 --- a/Carthage/Checkouts/Nimble +++ b/Carthage/Checkouts/Nimble @@ -1 +1 @@ -Subproject commit 9a281b1cfa1c53d1e8bd92e1798e4e473af8d263 +Subproject commit a27c5186ce2d65f60d1237660b2509df3eb29023 diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick index f2b5a0644..0b4ed6c70 160000 --- a/Carthage/Checkouts/Quick +++ b/Carthage/Checkouts/Quick @@ -1 +1 @@ -Subproject commit f2b5a06440ea87eba1a167cab37bf6496646c52e +Subproject commit 0b4ed6c706dd0cce923b5019a605a9bcc6b1b600 diff --git a/Package.resolved b/Package.resolved index 1452077c4..55eb05835 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/Quick/Nimble.git", "state": { "branch": null, - "revision": "9a281b1cfa1c53d1e8bd92e1798e4e473af8d263", - "version": "7.3.3" + "revision": "a27c5186ce2d65f60d1237660b2509df3eb29023", + "version": "8.0.0" } }, { @@ -15,8 +15,8 @@ "repositoryURL": "https://github.com/Quick/Quick.git", "state": { "branch": null, - "revision": "f2b5a06440ea87eba1a167cab37bf6496646c52e", - "version": "1.3.4" + "revision": "0b4ed6c706dd0cce923b5019a605a9bcc6b1b600", + "version": "2.0.0" } }, { diff --git a/Package.swift b/Package.swift index e24162201..25c3a5fef 100644 --- a/Package.swift +++ b/Package.swift @@ -8,8 +8,8 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/antitypical/Result.git", from: "4.1.0"), - .package(url: "https://github.com/Quick/Quick.git", from: "1.3.4"), - .package(url: "https://github.com/Quick/Nimble.git", from: "7.3.3"), + .package(url: "https://github.com/Quick/Quick.git", from: "2.0.0"), + .package(url: "https://github.com/Quick/Nimble.git", from: "8.0.0"), ], targets: [ .target(name: "ReactiveSwift", dependencies: ["Result"], path: "Sources"), diff --git a/Package@swift-4.2.swift b/Package@swift-4.2.swift index 4192bc765..cd5441fac 100644 --- a/Package@swift-4.2.swift +++ b/Package@swift-4.2.swift @@ -8,8 +8,8 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/antitypical/Result.git", from: "4.1.0"), - .package(url: "https://github.com/Quick/Quick.git", from: "1.3.4"), - .package(url: "https://github.com/Quick/Nimble.git", from: "7.3.3"), + .package(url: "https://github.com/Quick/Quick.git", from: "2.0.0"), + .package(url: "https://github.com/Quick/Nimble.git", from: "8.0.0"), ], targets: [ .target(name: "ReactiveSwift", dependencies: ["Result"], path: "Sources"), From 8bdcc8139c63304d4f76014aed1fa8eefbd055c0 Mon Sep 17 00:00:00 2001 From: Sho Ikeda Date: Sun, 3 Mar 2019 21:33:06 +0900 Subject: [PATCH 2/3] Adjust the macOS test target's deployment target setting --- ReactiveSwift.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ReactiveSwift.xcodeproj/project.pbxproj b/ReactiveSwift.xcodeproj/project.pbxproj index 597a6ec37..a0229df3e 100644 --- a/ReactiveSwift.xcodeproj/project.pbxproj +++ b/ReactiveSwift.xcodeproj/project.pbxproj @@ -1338,6 +1338,7 @@ buildSettings = { INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; }; name = Debug; @@ -1348,6 +1349,7 @@ buildSettings = { INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; }; name = Release; @@ -1433,6 +1435,7 @@ buildSettings = { INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; }; name = Profile; @@ -1496,6 +1499,7 @@ buildSettings = { INFOPLIST_FILE = Tests/ReactiveSwiftTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_NAME = "$(PROJECT_NAME)Tests"; }; name = Test; From 595a1baf82bdb5030c21692a0f2222d82f8a92f2 Mon Sep 17 00:00:00 2001 From: Sho Ikeda Date: Mon, 4 Mar 2019 10:36:52 +0900 Subject: [PATCH 3/3] [CI] Enable Xcode 10.2 tests --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 093f7030e..c221fae44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,8 +68,8 @@ aliases: matrix: include: - <<: *xcode - # - <<: *xcode - # osx_image: xcode10.2 + - <<: *xcode + osx_image: xcode10.2 # - <<: *xcode # osx_image: xcode10.2 # env: XCODE_ARGS="SWIFT_VERSION=5.0" @@ -83,10 +83,10 @@ matrix: env: - JOB=SwiftPM - SWIFT_VERSION=4.2.3 - # - <<: *swiftpm_linux - # env: - # - JOB=SwiftPM - # - SWIFT_VERSION=5.0-DEVELOPMENT-SNAPSHOT-2019-02-28-a + - <<: *swiftpm_linux + env: + - JOB=SwiftPM + - SWIFT_VERSION=5.0-DEVELOPMENT-SNAPSHOT-2019-02-28-a - stage: carthage script: carthage build --cache-builds --no-skip-current - stage: deploy