Upgrade to Xcode 26 (#153)

Author: jessesquires

.github/workflows/ci.yml

@@ -18,14 +18,14 @@ env:
   EXAMPLE_PROJECT: Example/ExampleApp.xcodeproj
   EXAMPLE_SCHEME: ExampleApp
 
-  DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_26.1.app/Contents/Developer
 
-  IOS_DEST: "platform=iOS Simulator,name=iPhone 16,OS=latest"
+  IOS_DEST: "platform=iOS Simulator,name=iPhone 17,OS=latest"
 
 jobs:
   env-details:
     name: Environment details
-    runs-on: macos-15
+    runs-on: macos-latest
     steps:
       - name: xcode version
         run: xcodebuild -version -sdk
@@ -37,7 +37,7 @@ jobs:
 
   test-iOS:
     name: iOS unit test
-    runs-on: macos-15
+    runs-on: macos-latest
     steps:
       - name: git checkout
         uses: actions/checkout@v6
@@ -53,7 +53,7 @@ jobs:
 
   ui-test-iOS:
     name: iOS UI tests
-    runs-on: macos-15
+    runs-on: macos-latest
     steps:
       - name: git checkout
         uses: actions/checkout@v6

.github/workflows/spm-ios.yml

@@ -12,14 +12,14 @@ on:
       - main
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer
-  IOS_DEST: "platform=iOS Simulator,name=iPhone 16,OS=latest"
+  DEVELOPER_DIR: /Applications/Xcode_26.1.app/Contents/Developer
+  IOS_DEST: "platform=iOS Simulator,name=iPhone 17,OS=latest"
   SCHEME: ReactiveCollectionsKit
 
 jobs:
   main:
     name: SwiftPM Build
-    runs-on: macos-15
+    runs-on: macos-latest
     steps:
       - name: git checkout
         uses: actions/checkout@v6

.swiftlint.yml

@@ -6,6 +6,7 @@ excluded:
   - Pods
   - docs
   - build
+  - .build
   - scripts
   - swiftpm
   - .bundle

CHANGELOG.md

@@ -7,7 +7,7 @@ NEXT
 
 - Improve debug descriptions (i.e., `CustomDebugStringConvertible`) for various types. ([@nuomi1](https://github.com/nuomi1), [#139](https://github.com/jessesquires/ReactiveCollectionsKit/pull/139))
 - Implement (optional) debug logging for view model updates. You can now provide a logger for debugging purposes by setting `CollectionViewDriver.logger`. The library provides a default implementation via `RCKLogger.shared`. ([@nuomi1](https://github.com/nuomi1), [#141](https://github.com/jessesquires/ReactiveCollectionsKit/pull/141))
-- TBA
+- Upgrade to Xcode 26. ([@jessesquires](https://github.com/jessesquires), [#153](https://github.com/jessesquires/ReactiveCollectionsKit/pull/153))
 
 0.1.8
 -----

Example/Tests/UITests/GridUITests.swift

@@ -25,7 +25,7 @@ final class GridUITests: XCTestCase, @unchecked Sendable {
 
     @MainActor
     func test_grid_shuffle() {
-        let shuffleButton = self.app.navigationBars["Grid"].buttons["repeat"]
+        let shuffleButton = self.app.buttons["shuffle"].firstMatch
         XCTAssertTrue(shuffleButton.waitForExistence(timeout: 3))
 
         for _ in 1...20 {
@@ -35,18 +35,19 @@ final class GridUITests: XCTestCase, @unchecked Sendable {
 
     @MainActor
     func test_grid_remove_reset() {
-        let shuffleButton = self.app.navigationBars["Grid"].buttons["repeat"]
+        let shuffleButton = self.app.buttons["shuffle"].firstMatch
         XCTAssertTrue(shuffleButton.waitForExistence(timeout: 3))
         shuffleButton.tap()
 
-        let resetButton = self.app.navigationBars["Grid"].buttons["Refresh"]
+        let resetButton = self.app.buttons["Refresh"].firstMatch
         XCTAssertTrue(resetButton.waitForExistence(timeout: 3))
         resetButton.tap()
 
-        let collectionViewsQuery = self.app.collectionViews
-        collectionViewsQuery.buttons["Remove All"].tap()
+        let removeAllButton = self.app.buttons["Remove All"].firstMatch
+        XCTAssertTrue(removeAllButton.waitForExistence(timeout: 3))
+        removeAllButton.tap()
 
+        XCTAssertTrue(resetButton.waitForExistence(timeout: 3))
         resetButton.tap()
-        collectionViewsQuery.buttons["Reset"].tap()
     }
 }

Example/Tests/UITests/ListUITests.swift

@@ -25,9 +25,13 @@ final class ListUITests: XCTestCase, @unchecked Sendable {
 
     @MainActor
     func test_list_shuffle() {
-        self.app.tabBars["Tab Bar"].buttons["List"].tap()
+        let listTab = self.app.images["list.dash"].firstMatch
+        listTab.tap()
 
-        let shuffleButton = self.app.navigationBars["List"].buttons["repeat"]
+        let listView = self.app.staticTexts["List"].firstMatch
+        XCTAssertTrue(listView.waitForExistence(timeout: 3))
+
+        let shuffleButton = self.app.buttons["shuffle"].firstMatch
         XCTAssertTrue(shuffleButton.waitForExistence(timeout: 3))
 
         for _ in 1...20 {
@@ -37,20 +41,25 @@ final class ListUITests: XCTestCase, @unchecked Sendable {
 
     @MainActor
     func test_list_remove_reset() {
-        self.app.tabBars["Tab Bar"].buttons["List"].tap()
+        let listTab = self.app.images["list.dash"].firstMatch
+        listTab.tap()
+
+        let listView = self.app.staticTexts["List"].firstMatch
+        XCTAssertTrue(listView.waitForExistence(timeout: 3))
 
-        let shuffleButton = self.app.navigationBars["List"].buttons["repeat"]
+        let shuffleButton = self.app.buttons["shuffle"].firstMatch
         XCTAssertTrue(shuffleButton.waitForExistence(timeout: 3))
         shuffleButton.tap()
 
-        let resetButton = self.app.navigationBars["List"].buttons["Refresh"]
+        let resetButton = self.app.buttons["Refresh"].firstMatch
         XCTAssertTrue(resetButton.waitForExistence(timeout: 3))
         resetButton.tap()
 
-        let collectionViewsQuery = self.app.collectionViews
-        collectionViewsQuery.buttons["Remove All"].tap()
+        let removeAllButton = self.app.buttons["Remove All"].firstMatch
+        XCTAssertTrue(removeAllButton.waitForExistence(timeout: 3))
+        removeAllButton.tap()
 
+        XCTAssertTrue(resetButton.waitForExistence(timeout: 3))
         resetButton.tap()
-        collectionViewsQuery.buttons["Reset"].tap()
     }
 }

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:6.0
+// swift-tools-version:6.2
 // The swift-tools-version declares the minimum version
 // of Swift required to build this package.
 // ----------------------------------------------------

README.md

@@ -92,7 +92,7 @@ driver.update(viewModel: updated)
 
 - iOS 15.0+
 - Swift 5.10+
-- Xcode 16.0+
+- Xcode 26.0+
 - [SwiftLint](https://github.com/realm/SwiftLint)
 
 ## Installation

scripts/lint.zsh

@@ -33,7 +33,7 @@ fi
 PROJECT="ReactiveCollectionsKit.xcodeproj"
 SCHEME="ReactiveCollectionsKit"
 
-VERSION="0.57.0"
+VERSION="0.62.2"
 FOUND=$(swiftlint version)
 CONFIG="./.swiftlint.yml"