Changes to support Xcode 16

ReactiveCocoa · Nov 11, 2024 · 4df1b55 · 4df1b55
1 parent a1ac77e
commit 4df1b55
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -11,19 +11,19 @@ on:
       - master
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_16.0.app/Contents/Developer
 
 name: Verification | Release
 jobs:
   carthage:
     if: ${{ github.event_name == 'push' || ( github.event_name == 'pull_request' && github.event.label.name == 'ci:verify' ) }}
     name: Carthage Verification
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Recover cached dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: dependency-cache
         with:
           path: ~/Library/Caches/org.carthage.CarthageKit
@@ -36,7 +36,7 @@ jobs:
   swiftpm-macos:
     if: ${{ github.event_name == 'push' || ( github.event_name == 'pull_request' && github.event.label.name == 'ci:verify' ) }}
     name: SwiftPM macOS Verification
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -51,7 +51,7 @@ jobs:
   cocoapods:
     if: ${{ github.event_name == 'push' || ( github.event_name == 'pull_request' && github.event.label.name == 'ci:verify' ) }}
     name: CocoaPods Verification
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -63,7 +63,7 @@ jobs:
   release-github:
     if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
     name: GitHub Release
-    runs-on: macos-14
+    runs-on: macos-15
     needs: [swiftpm-macos, cocoapods, carthage]
     steps:
       - name: git checkout
@@ -74,7 +74,7 @@ jobs:
   release-cocoapods:
     if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
     name: CocoaPods Release
-    runs-on: macos-14
+    runs-on: macos-15
     needs: [swiftpm-macos, cocoapods, carthage]
     steps:
       - name: git checkout

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,13 +3,13 @@ name: Test
 jobs:
   test:
     name: Test
-    runs-on: macos-14
+    runs-on: macos-15
     strategy:
         fail-fast: false
         matrix:
           destination: [macOS, iOS, tvOS, watchOS]
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.0.app/Contents/Developer
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -68,7 +68,7 @@ jobs:
   swiftpm-linux:
     strategy:
       matrix:
-        swift: ["5.7"]
+        swift: ["5.9"]
 
     name: SwiftPM Linux
     runs-on: ubuntu-22.04

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@
 1. Fix CI release git tag push trigger (#869, kudos to @p4checo)
 1. Find and remove items from Bag using a binary search to improve performance when the collection gets large (#878, kudos to @nickoto)
 1. Add extension to `ScopedDisposable` for inner `SerialDisposable` (#873, kudos to @sirnacnud)
-1. Updated project settings for Xcode 15.2, bumped min deployment targets to iOS 12, macOS 10.13, tvOS 12, watchOS 4, visionOS 1.0 (#883, kudos to @mluisbrown)
+1. Updated project settings for Xcode 16, bumped min deployment targets to iOS 12, macOS 10.13, tvOS 12, watchOS 4, visionOS 1.0 (#883, kudos to @mluisbrown)
 
 # 7.1.1
 1. Bumped deployment target to iOS 11, tvOS 11, watchOS 4, macOS 10.13, per Xcode 14 warnings (#865, kudos to @lickel)

diff --git a/Tests/ReactiveSwiftTests/SchedulerSpec.swift b/Tests/ReactiveSwiftTests/SchedulerSpec.swift
@@ -6,9 +6,6 @@
 //  Copyright (c) 2014 GitHub. All rights reserved.
 //
 
-#if canImport(Darwin)
-import Darwin.sys.qos
-#endif
 import Dispatch
 import Foundation