Skip to content

Commit 0087a06

Browse files
authored
Merge pull request #7909 from element-hq/mauroromito/support_for_xode_16
Support for building with Xcode 16
2 parents 3f8bfe6 + 3c47aba commit 0087a06

File tree

12 files changed

+119
-92
lines changed

12 files changed

+119
-92
lines changed

.github/workflows/ci-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ env:
1515
jobs:
1616
build:
1717
name: Build
18-
runs-on: macos-14
18+
runs-on: macos-15
1919

2020
# Concurrency group not needed as this workflow only runs on develop which we always want to test.
2121

@@ -26,13 +26,13 @@ jobs:
2626

2727
# Common cache
2828
# Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
29-
- uses: actions/cache@v2
29+
- uses: actions/cache@v4
3030
with:
3131
path: Pods
3232
key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
3333
restore-keys: |
3434
${{ runner.os }}-pods-
35-
- uses: actions/cache@v2
35+
- uses: actions/cache@v4
3636
with:
3737
path: vendor/bundle
3838
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}

.github/workflows/ci-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
jobs:
1717
tests:
1818
name: Tests
19-
runs-on: macos-14
19+
runs-on: macos-15
2020

2121
concurrency:
2222
# When running on develop, use the sha to allow all runs of this workflow to run concurrently.
@@ -31,13 +31,13 @@ jobs:
3131

3232
# Common cache
3333
# Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
34-
- uses: actions/cache@v2
34+
- uses: actions/cache@v4
3535
with:
3636
path: Pods
3737
key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
3838
restore-keys: |
3939
${{ runner.os }}-pods-
40-
- uses: actions/cache@v2
40+
- uses: actions/cache@v4
4141
with:
4242
path: vendor/bundle
4343
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}

.github/workflows/ci-ui-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
jobs:
1313
tests:
1414
name: UI Tests
15-
runs-on: macos-14
15+
runs-on: macos-15
1616

1717
concurrency:
1818
# Only allow a single run of this workflow on each branch, automatically cancelling older runs.
@@ -26,13 +26,13 @@ jobs:
2626

2727
# Common cache
2828
# Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
29-
- uses: actions/cache@v2
29+
- uses: actions/cache@v4
3030
with:
3131
path: Pods
3232
key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
3333
restore-keys: |
3434
${{ runner.os }}-pods-
35-
- uses: actions/cache@v2
35+
- uses: actions/cache@v4
3636
with:
3737
path: vendor/bundle
3838
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}

.github/workflows/release-alpha.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
if: contains(github.event.pull_request.labels.*.name, 'Trigger-PR-Build')
1818

1919
name: Release
20-
runs-on: macos-14
20+
runs-on: macos-15
2121

2222
concurrency:
2323
# Only allow a single run of this workflow on each branch, automatically cancelling older runs.
@@ -32,15 +32,15 @@ jobs:
3232
# Common cache
3333
# Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
3434
- name: Cache CocoaPods libraries
35-
uses: actions/cache@v2
35+
uses: actions/cache@v4
3636
with:
3737
path: Pods
3838
key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
3939
restore-keys: |
4040
${{ runner.os }}-pods-
4141
4242
- name: Cache Ruby gems
43-
uses: actions/cache@v2
43+
uses: actions/cache@v4
4444
with:
4545
path: vendor/bundle
4646
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ source "https://rubygems.org"
22

33
gem "xcode-install"
44
gem "fastlane"
5-
gem "cocoapods", '~>1.14.3'
5+
gem "cocoapods", '~>1.16.2'
66
gem "slather"
77

88
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')

0 commit comments

Comments
 (0)