Merge pull request #491 from bitmovin/feature/update-iOS-CI-to-use-Xc…

…ode-15.4 Update CI Xcode version to 15.4
bitmovin · Jul 8, 2024 · 0998f2f · 0998f2f
2 parents 1fbb1dd + 4efecde
commit 0998f2f
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 39 deletions.
diff --git a/.github/actions/setup-environment/action.yml b/.github/actions/setup-environment/action.yml
@@ -18,10 +18,6 @@ inputs:
     description: Setup xcode and install dependencies (overrides `brew` input)
     default: false
     required: false
-  restore-pods:
-    description: Restores the Pod cache
-    default: false
-    required: false
   java:
     description: Setup Java and Gradle cache
     default: false
@@ -69,21 +65,9 @@ runs:
     - uses: maxim-lobanov/setup-xcode@v1
       if: ${{ inputs.ios == 'true' }}
       with:
-        xcode-version: '14.3'
+        xcode-version: '15.4'
 
     - name: Install dependencies
       if: ${{ inputs.ios == 'true' || inputs.brew == 'true' }}
       shell: bash
       run: brew bundle install
-
-    - name: Restore Pods cache
-      if: ${{ inputs.restore-pods == 'true' }}
-      id: pods-cache-restore
-      uses: actions/cache/restore@v3
-      with:
-        path: |
-          .cocoapods-cache
-          example/ios/Pods
-          integration_test/ios/Pods
-        key: pods-${{ hashFiles('example/ios/Podfile.lock') }}-${{ hashFiles('integration_test/ios/Podfile.lock') }}
-        restore-keys: pods-
diff --git a/.github/workflows/ci-android.yml b/.github/workflows/ci-android.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     paths:
       - '.github/workflows/ci-android.yml'
+      - '.github/actions/**'
       - 'package.json'
       - 'yarn.lock'
       - 'android/**'
@@ -15,6 +16,7 @@ on:
     branches: [development]
     paths:
       - '.github/workflows/ci-android.yml'
+      - '.github/actions/**'
       - 'package.json'
       - 'yarn.lock'
       - 'android/**'

diff --git a/.github/workflows/ci-ios-tvos.yml b/.github/workflows/ci-ios-tvos.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     paths:
       - '.github/workflows/ci-ios-tvos.yml'
+      - '.github/actions/**'
       - 'package.json'
       - 'yarn.lock'
       - 'ios/**'
@@ -18,6 +19,7 @@ on:
     branches: [development]
     paths:
       - '.github/workflows/ci-ios-tvos.yml'
+      - '.github/actions/**'
       - 'package.json'
       - 'yarn.lock'
       - 'ios/**'
@@ -64,7 +66,16 @@ jobs:
           node: true
           subprojects: true
           ios: true
-          restore-pods: true
+
+      - name: Restore Pods cache
+        id: pods-cache-restore
+        uses: actions/cache/restore@v3
+        with:
+          path: |
+            .cocoapods-cache
+            example/ios/Pods
+          key: pods-${{ hashFiles('example/ios/Podfile.lock') }}
+          restore-keys: pods-
 
       - name: Install pods
         run: |
@@ -108,7 +119,16 @@ jobs:
           node: true
           subprojects: true
           ios: true
-          restore-pods: true
+
+      - name: Restore Pods cache
+        id: pods-cache-restore
+        uses: actions/cache/restore@v3
+        with:
+          path: |
+            .cocoapods-cache
+            example/ios/Pods
+          key: pods-${{ hashFiles('example/ios/Podfile.lock') }}
+          restore-keys: pods-
 
       - name: Install pods
         run: |

diff --git a/.github/workflows/ci-typescript.yml b/.github/workflows/ci-typescript.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     paths:
       - '.github/workflows/ci-typescript.yml'
+      - '.github/actions/**'
       - '**.ts'
       - '**.tsx'
       - '**.js'
@@ -24,6 +25,7 @@ on:
     branches: [development]
     paths:
       - '.github/workflows/ci-typescript.yml'
+      - '.github/actions/**'
       - '**.ts'
       - '**.tsx'
       - '**.js'

diff --git a/Brewfile b/Brewfile
@@ -1 +1,2 @@
 brew "swiftlint"
+brew "xcbeautify"
diff --git a/Brewfile.lock.json b/Brewfile.lock.json
@@ -2,45 +2,79 @@
   "entries": {
     "brew": {
       "swiftlint": {
-        "version": "0.53.0",
+        "version": "0.55.1",
         "bottle": {
-          "rebuild": 0,
+          "rebuild": 1,
           "root_url": "https://ghcr.io/v2/homebrew/core",
           "files": {
             "arm64_sonoma": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:240ccda9de55d948d0c635798079074099bfcb73ffda41428900fdc748aeea7b",
-              "sha256": "240ccda9de55d948d0c635798079074099bfcb73ffda41428900fdc748aeea7b"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:0610290fef665ecfc022ec3e8e3986224841290274a21efdee503e76b7b39bcc",
+              "sha256": "0610290fef665ecfc022ec3e8e3986224841290274a21efdee503e76b7b39bcc"
             },
             "arm64_ventura": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:7b7ceb7896c6833965cc4eac9001255d8adde6c5432045d5a8ab6aea8a9e81d9",
-              "sha256": "7b7ceb7896c6833965cc4eac9001255d8adde6c5432045d5a8ab6aea8a9e81d9"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:af05ed001b0476ed0391778516ed92cc3ed100593a03794025c1814e6dec0cb4",
+              "sha256": "af05ed001b0476ed0391778516ed92cc3ed100593a03794025c1814e6dec0cb4"
             },
             "arm64_monterey": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:78c2a4c3f4a2f6847b484527b0f0f916da71e3ee29e49890fd44b63fe7b38e26",
-              "sha256": "78c2a4c3f4a2f6847b484527b0f0f916da71e3ee29e49890fd44b63fe7b38e26"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:2e1313a57188d5a751f038596509f0186a058669abfd21aa3142457f9c16c478",
+              "sha256": "2e1313a57188d5a751f038596509f0186a058669abfd21aa3142457f9c16c478"
             },
             "sonoma": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:abdca78dd8a8bd268053b3be195fe891bb74aef5502ab3a6b871ae0c6bb04540",
-              "sha256": "abdca78dd8a8bd268053b3be195fe891bb74aef5502ab3a6b871ae0c6bb04540"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:148e407d81cedffbe76876288f78a35fee69f82d12b2fb3356ca102c2fd6d319",
+              "sha256": "148e407d81cedffbe76876288f78a35fee69f82d12b2fb3356ca102c2fd6d319"
             },
             "ventura": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:be711c707bf3b49fa0dd6e2ae576b309aad620f9b56a2c6e7b1ac5cf35cf652a",
-              "sha256": "be711c707bf3b49fa0dd6e2ae576b309aad620f9b56a2c6e7b1ac5cf35cf652a"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:709d73d12dd3adf64e276b04e94949749b5073f7ca946e0ead585557cfe9277c",
+              "sha256": "709d73d12dd3adf64e276b04e94949749b5073f7ca946e0ead585557cfe9277c"
             },
             "monterey": {
               "cellar": ":any_skip_relocation",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:13487d68a971dbe035019364e19d70641af2a18c06e52925d238685b384a7979",
-              "sha256": "13487d68a971dbe035019364e19d70641af2a18c06e52925d238685b384a7979"
+              "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:30ea7b1e56634ccd521ffe86a93372e02004cf25b0a10432a5b54520a71d4139",
+              "sha256": "30ea7b1e56634ccd521ffe86a93372e02004cf25b0a10432a5b54520a71d4139"
+            },
+            "x86_64_linux": {
+              "cellar": "/home/linuxbrew/.linuxbrew/Cellar",
+              "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:0f68576b2b4591e126e923278c4aa25c28aa18b7e5a9f8a3b8d7cf8eeacfe3a2",
+              "sha256": "0f68576b2b4591e126e923278c4aa25c28aa18b7e5a9f8a3b8d7cf8eeacfe3a2"
+            }
+          }
+        }
+      },
+      "xcbeautify": {
+        "version": "2.4.0",
+        "bottle": {
+          "rebuild": 0,
+          "root_url": "https://ghcr.io/v2/homebrew/core",
+          "files": {
+            "arm64_sonoma": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:6a51e17f553aa9d493bf806489fa506c178fed38b18b45a94cd6cbb8a50ed042",
+              "sha256": "6a51e17f553aa9d493bf806489fa506c178fed38b18b45a94cd6cbb8a50ed042"
+            },
+            "arm64_ventura": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:9717191935a921a937474cc785728238efe4cbea9d590d97927f4f9c990d5e6b",
+              "sha256": "9717191935a921a937474cc785728238efe4cbea9d590d97927f4f9c990d5e6b"
+            },
+            "sonoma": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:61a163991b33aa679931917fb1952aa9d6c3b3bf57c5637c24be89da513cb49f",
+              "sha256": "61a163991b33aa679931917fb1952aa9d6c3b3bf57c5637c24be89da513cb49f"
+            },
+            "ventura": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:08bdbf866a823ba2d27db510eaaf191d0c2a87a69687b86c5efa96e546f43d51",
+              "sha256": "08bdbf866a823ba2d27db510eaaf191d0c2a87a69687b86c5efa96e546f43d51"
             },
             "x86_64_linux": {
               "cellar": "/home/linuxbrew/.linuxbrew/Cellar",
-              "url": "https://ghcr.io/v2/homebrew/core/swiftlint/blobs/sha256:fbbc56fccfcfcd34564feb7325567e2ff3638d3c609396a5c4aa13311c7b26e0",
-              "sha256": "fbbc56fccfcfcd34564feb7325567e2ff3638d3c609396a5c4aa13311c7b26e0"
+              "url": "https://ghcr.io/v2/homebrew/core/xcbeautify/blobs/sha256:a157d806c66671dec34bd0dc3dd7ae5fe193e59a527579db79ba7d3fe1824770",
+              "sha256": "a157d806c66671dec34bd0dc3dd7ae5fe193e59a527579db79ba7d3fe1824770"
             }
           }
         }
@@ -56,6 +90,14 @@
         "CLT": "",
         "Xcode": "15.0.1",
         "macOS": "14.0"
+      },
+      "sequoia": {
+        "HOMEBREW_VERSION": "4.3.8",
+        "HOMEBREW_PREFIX": "/opt/homebrew",
+        "Homebrew/homebrew-core": "api",
+        "CLT": "16.0.0.0.1.1719078471",
+        "Xcode": "16.0",
+        "macOS": "15.0"
       }
     }
   }

diff --git a/RNBitmovinPlayer.podspec b/RNBitmovinPlayer.podspec
@@ -18,6 +18,7 @@ Pod::Spec.new do |s|
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
+  s.swift_version = "5.10"
   s.dependency "React-Core"
   s.dependency "BitmovinPlayer", "3.66.1"
   s.ios.dependency "GoogleAds-IMA-iOS-SDK", "3.23.0"

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1302,11 +1302,11 @@ SPEC CHECKSUMS:
   React-runtimescheduler: 20b2202e3396589a71069d12ae9f328949c7c7b8
   React-utils: 0307d396f233e47a167b5aaf045b0e4e1dc19d74
   ReactCommon: 17891ca337bfa5a7263649b09f27a8c664537bf2
-  RNBitmovinPlayer: 57b3b5672e59031080ce43928f3c1f2275eaec00
+  RNBitmovinPlayer: a740646ccc2a93e73be8a048c14ee8c2f95b0998
   RNCPicker: b18aaf30df596e9b1738e7c1f9ee55402a229dca
   RNScreens: b582cb834dc4133307562e930e8fa914b8c04ef2
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
-  Yoga: ab50eb8f7fcf1b36aad1801b5687b66b2c0aa000
+  Yoga: e7f2a2256464d4ef7b3825d216bd22aac3b449c1
 
 PODFILE CHECKSUM: e89ebfe6215567e7e15880586d123e5ea122588c
 

diff --git a/integration_test/ios/Podfile.lock b/integration_test/ios/Podfile.lock
@@ -1267,9 +1267,9 @@ SPEC CHECKSUMS:
   React-runtimescheduler: 20b2202e3396589a71069d12ae9f328949c7c7b8
   React-utils: 0307d396f233e47a167b5aaf045b0e4e1dc19d74
   ReactCommon: 17891ca337bfa5a7263649b09f27a8c664537bf2
-  RNBitmovinPlayer: 57b3b5672e59031080ce43928f3c1f2275eaec00
+  RNBitmovinPlayer: a740646ccc2a93e73be8a048c14ee8c2f95b0998
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
-  Yoga: ab50eb8f7fcf1b36aad1801b5687b66b2c0aa000
+  Yoga: e7f2a2256464d4ef7b3825d216bd22aac3b449c1
 
 PODFILE CHECKSUM: 0bfe194f5e28f1cf54d3d732eda8c78fadbeeedd