Merge pull request #245 from nnsnodnb/fix-ci

Update CI
RxSwiftCommunity · Oct 12, 2023 · 13597a6 · 13597a6
2 parents 90259f7 + 28710d6
commit 13597a6
Show file tree

Hide file tree

Showing 15 changed files with 370 additions and 305 deletions.
diff --git a/.github/workflows/ci.yml b/.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
diff --git a/Action.xcodeproj/project.pbxproj b/Action.xcodeproj/project.pbxproj
diff --git a/Action.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Action.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,41 @@
+{
+  "pins" : [
+    {
+      "identity" : "cwlcatchexception",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/mattgallagher/CwlCatchException.git",
+      "state" : {
+        "revision" : "3b123999de19bf04905bc1dfdb76f817b0f2cc00",
+        "version" : "2.1.2"
+      }
+    },
+    {
+      "identity" : "cwlpreconditiontesting",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/mattgallagher/CwlPreconditionTesting.git",
+      "state" : {
+        "revision" : "a23ded2c91df9156628a6996ab4f347526f17b6b",
+        "version" : "2.1.2"
+      }
+    },
+    {
+      "identity" : "nimble",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Quick/Nimble.git",
+      "state" : {
+        "revision" : "edaedc1ec86f14ac6e2ca495b94f0ff7150d98d0",
+        "version" : "12.3.0"
+      }
+    },
+    {
+      "identity" : "quick",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Quick/Quick.git",
+      "state" : {
+        "revision" : "ef9aaf3f634b3a1ab6f54f1173fe2400b36e7cb8",
+        "version" : "7.3.0"
+      }
+    }
+  ],
+  "version" : 2
+}
diff --git a/Cartfile.private b/Cartfile.private
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -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"
diff --git a/Package.resolved b/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
         "state": {
           "branch": null,
-          "revision": "002d325b0bdee94e7882e1114af5ff4fe1e96afa",
-          "version": "5.1.1"
+          "revision": "9dcaa4b333db437b0fbfaf453fad29069044a8b4",
+          "version": "6.6.0"
         }
       }
     ]

diff --git a/Tests/ActionTests.swift b/Tests/ActionTests.swift
@@ -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!
 

diff --git a/Tests/Nimble+RxTest+Ext.swift b/Tests/Nimble+RxTest+Ext.swift
@@ -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

diff --git a/Tests/iOS-Tests/AlertActionTests.swift b/Tests/iOS-Tests/AlertActionTests.swift
@@ -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())

diff --git a/Tests/iOS-Tests/BarButtonTests.swift b/Tests/iOS-Tests/BarButtonTests.swift
@@ -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)