Merge pull request #245 from nnsnodnb/fix-ci

Update CI

Author: ashfurrow

.github/workflows/ci.yml

@@ -2,30 +2,26 @@ name: CI
 on: [push, pull_request]
 jobs:
   xcode:
-    runs-on: macos-10.15
-    strategy:
-      matrix:
-        swift: [5.0, 4.2]
-      fail-fast: false
-    name: Action Tests (Swift ${{ matrix.swift }})
+    runs-on: macos-13
+    name: Action Tests (Swift 5.0)
     env:
-      DEVELOPER_DIR: /Applications/Xcode_11.7.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Cache Carthage
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: Carthage
           key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
           restore-keys: |
             ${{ runner.os }}-carthage-
       - name: Bootstrap Carthage
-        run: carthage bootstrap --no-use-binaries --cache-builds
+        run: carthage bootstrap --no-use-binaries --use-xcframeworks --cache-builds
       - name: Tests
         run: |
-          set -o pipefail && xcodebuild test SWIFT_VERSION=${{ matrix.swift }} -workspace Action.xcworkspace -scheme Action -destination "platform=iOS Simulator,name=iPhone 11" | xcpretty -c --test
-          set -o pipefail && xcodebuild test SWIFT_VERSION=${{ matrix.swift }} -workspace Action.xcworkspace -scheme Action-macOS -destination "arch=x86_64" | xcpretty -c --test
+          set -o pipefail && xcodebuild test clean SWIFT_VERSION=5.0 -workspace Action.xcworkspace -scheme Action -destination "platform=iOS Simulator,name=iPhone 14" | xcpretty -c --test
+          set -o pipefail && xcodebuild test clean SWIFT_VERSION=5.0 -workspace Action.xcworkspace -scheme Action-macOS -destination "arch=x86_64" | xcpretty -c --test
       - name: Builds
         run: |
-          set -o pipefail && xcodebuild build SWIFT_VERSION=${{ matrix.swift }} -workspace Action.xcworkspace -scheme Action-watchOS -destination "platform=watchOS Simulator,name=Apple Watch Series 5 - 44mm" | xcpretty -c
-          set -o pipefail && xcodebuild build SWIFT_VERSION=${{ matrix.swift }} -workspace Action.xcworkspace -scheme Action-tvOS -destination "platform=tvOS Simulator,name=Apple TV 4K (at 1080p)" | xcpretty -c
+          set -o pipefail && xcodebuild build clean SWIFT_VERSION=5.0 -workspace Action.xcworkspace -scheme Action-watchOS -destination "platform=watchOS Simulator,name=Apple Watch Series 5 (44mm)" | xcpretty -c
+          set -o pipefail && xcodebuild build clean SWIFT_VERSION=5.0 -workspace Action.xcworkspace -scheme Action-tvOS -destination "platform=tvOS Simulator,name=Apple TV 4K (3rd generation) (at 1080p)" | xcpretty -c

Action.xcodeproj/project.pbxproj

@@ -1,3 +1 @@
-github "Quick/Nimble" "v9.0.0"
-github "Quick/Quick" "v3.1.2"
-github "ReactiveX/RxSwift" "6.1.0"
+github "ReactiveX/RxSwift" "6.6.0"

Action.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -5,7 +5,7 @@ import RxTest
 @testable import Action
 
 class ActionTests: QuickSpec {
-    override func spec() {
+    override class func spec() {
         var scheduler: TestScheduler!
         var disposeBag: DisposeBag!
 

Cartfile.private

@@ -38,7 +38,7 @@ extension PredicateResult {
     }
 }
 
-public func match<T>(_ expected: T) -> Predicate<T> where T: Equatable {
+public func match<T>(_ expected: T) -> Nimble.Predicate<T> where T: Equatable {
     return Predicate { events in
 
         guard let source = try events.evaluate() else {
@@ -54,7 +54,7 @@ public func match<T>(_ expected: T) -> Predicate<T> where T: Equatable {
     }
 }
 
-public func match<T>(_ expected: [Recorded<Event<T>>]) -> Predicate<[Recorded<Event<T>>]> where T: Equatable {
+public func match<T>(_ expected: [Recorded<Event<T>>]) -> Nimble.Predicate<[Recorded<Event<T>>]> where T: Equatable {
     return Predicate { events in
 
         guard let source = try events.evaluate() else {
@@ -78,7 +78,7 @@ public func match<T>(_ expected: [Recorded<Event<T>>]) -> Predicate<[Recorded<Ev
     }
 }
 
-public func match<T, E: Error>(with expectedErrors: [Recorded<Event<E>>]) -> Predicate<[Recorded<Event<T>>]> where E: Equatable {
+public func match<T, E: Error>(with expectedErrors: [Recorded<Event<E>>]) -> Nimble.Predicate<[Recorded<Event<T>>]> where E: Equatable {
     return Predicate { events in
         guard let source = try events.evaluate() else {
             return PredicateResult.evaluationFailed

Cartfile.resolved

@@ -1,10 +1,11 @@
 import Quick
 import Nimble
 import RxSwift
+import UIKit
 import Action
 
 class AlertActionTests: QuickSpec {
-    override func spec() {
+    override class func spec() {
         it("is nil by default") {
             let subject = UIAlertAction.Action("Hi", style: .default)
             expect(subject.rx.action).to(beNil())

Package.resolved

@@ -1,10 +1,11 @@
 import Quick
 import Nimble
 import RxSwift
+import UIKit
 import Action
 
 class BarButtonTests: QuickSpec {
-	override func spec() {
+    override class func spec() {
 
 		it("is nil by default") {
 			let subject = UIBarButtonItem(barButtonSystemItem: .save, target: nil, action: nil)