Update CI to use Xcode 15.2 and most recent GH action modules.

Update podspec to declare support for Swift 5.8 and 5.9
ReactiveCocoa · Mar 18, 2024 · 8367745 · 8367745
1 parent ee00917
commit 8367745
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 23 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -11,22 +11,19 @@ on:
       - master
 
 env:
-  # Keep using Xcode 13 until CP releases the fix for watchOS verification on Xcode 14
-  # https://github.com/CocoaPods/CocoaPods/issues/11558
-  # https://github.com/CocoaPods/CocoaPods/pull/11660
-  DEVELOPER_DIR: /Applications/Xcode_13.4.1.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_15.2.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-12
+    runs-on: macos-14
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Recover cached dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         id: dependency-cache
         with:
           path: ~/Library/Caches/org.carthage.CarthageKit
@@ -39,10 +36,10 @@ 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-12
+    runs-on: macos-14
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Pull dependencies
         run: |
           swift package resolve
@@ -54,10 +51,10 @@ jobs:
   cocoapods:
     if: ${{ github.event_name == 'push' || ( github.event_name == 'pull_request' && github.event.label.name == 'ci:verify' ) }}
     name: CocoaPods Verification
-    runs-on: macos-12
+    runs-on: macos-14
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: CocoaPods verification
         run: |
           pod repo update
@@ -66,22 +63,22 @@ jobs:
   release-github:
     if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
     name: GitHub Release
-    runs-on: macos-12
+    runs-on: macos-14
     needs: [swiftpm-macos, cocoapods, carthage]
     steps:
       - name: git checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: create release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
 
   release-cocoapods:
     if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
     name: CocoaPods Release
-    runs-on: macos-12
+    runs-on: macos-14
     needs: [swiftpm-macos, cocoapods, carthage]
     steps:
       - name: git checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: pod trunk push
         env:
           COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,18 +3,18 @@ name: Test
 jobs:
   test:
     name: Test
-    runs-on: macos-12
+    runs-on: macos-14
     strategy:
         fail-fast: false
         matrix:
           destination: [macOS, iOS, tvOS, watchOS]
     env:
-      DEVELOPER_DIR: /Applications/Xcode_14.1.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Recover cached dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         id: dependency-cache
         with:
           path: Carthage/Checkouts
@@ -74,11 +74,11 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Setup Swift version
-        uses: swift-actions/setup-swift@v1
+        uses: swift-actions/setup-swift@v2
         with:
           swift-version: ${{ matrix.swift }}
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Pull dependencies
         run: |
           swift package resolve

diff --git a/ReactiveSwift.podspec b/ReactiveSwift.podspec
@@ -25,5 +25,5 @@ Pod::Spec.new do |s|
   }
 
   s.cocoapods_version = ">= 1.7.0"
-  s.swift_versions = ["5.2", "5.3" "5.4", "5.5", "5.6", "5.7"]
+  s.swift_versions = ["5.2", "5.3" "5.4", "5.5", "5.6", "5.7", "5.8", "5.9"]
 end