Skip to content

Commit efbb21e

Browse files
a-mauricea-maurice
authored
Update dependencies to latest, and other fixes (#937)
1 parent f6cbd84 commit efbb21e

16 files changed

+59
-52
lines changed

‎.github/workflows/build-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Setup python
3333
uses: actions/setup-python@v4
3434
with:
35-
python-version: '3.7'
35+
python-version: '3.8'
3636

3737
- name: Install prerequisites
3838
shell: bash

‎.github/workflows/build_android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
- name: Setup python
6565
uses: actions/setup-python@v4
6666
with:
67-
python-version: '3.7'
67+
python-version: '3.8'
6868

6969
- name: Cache NDK
7070
id: cache_ndk

‎.github/workflows/build_ios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
- name: Setup python
6666
uses: actions/setup-python@v4
6767
with:
68-
python-version: '3.7'
68+
python-version: '3.8'
6969

7070
- name: setup Xcode version
7171
run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer

‎.github/workflows/build_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- name: Setup python
6161
uses: actions/setup-python@v4
6262
with:
63-
python-version: '3.7'
63+
python-version: '3.8'
6464

6565
- name: Install prerequisites
6666
shell: bash

‎.github/workflows/build_macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
- name: Setup python
6969
uses: actions/setup-python@v4
7070
with:
71-
python-version: '3.7'
71+
python-version: '3.8'
7272

7373
- name: Add msbuild to PATH (windows)
7474
if: startsWith(matrix.os, 'windows')
@@ -108,7 +108,7 @@ jobs:
108108
echo "SWIG_DIR=$(swig -swiglib)" >> $GITHUB_ENV
109109
110110
- name: Build SDK (MacOS)
111-
timeout-minutes: 90
111+
timeout-minutes: 120
112112
shell: bash
113113
run: |
114114
if [ -f /usr/local/bin/python3.11 ]; then

‎.github/workflows/build_starter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ on:
5656
required: true
5757

5858
env:
59-
pythonVersion: '3.7'
59+
pythonVersion: '3.8'
6060

6161
jobs:
6262
check_and_prepare:

‎.github/workflows/build_tvos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
- name: Setup python
8787
uses: actions/setup-python@v4
8888
with:
89-
python-version: '3.7'
89+
python-version: '3.8'
9090

9191
- name: setup Xcode version
9292
run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer

‎.github/workflows/build_windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- name: Setup python
6464
uses: actions/setup-python@v4
6565
with:
66-
python-version: '3.7'
66+
python-version: '3.8'
6767

6868
- name: Add msbuild to PATH (windows)
6969
uses: microsoft/[email protected]

‎.github/workflows/generate_swig.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: Setup python
4949
uses: actions/setup-python@v4
5050
with:
51-
python-version: '3.7'
51+
python-version: '3.8'
5252

5353
- name: Install prerequisites
5454
shell: bash

‎.github/workflows/integration_tests.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ env:
3535
triggerLabelPrefix: "tests-requested: "
3636
triggerLabelFull: "tests-requested: full"
3737
triggerLabelQuick: "tests-requested: quick"
38-
pythonVersion: '3.7'
38+
pythonVersion: '3.8'
3939
artifactRetentionDays: 2
4040

4141
jobs:
@@ -185,7 +185,7 @@ jobs:
185185
- name: Setup python
186186
uses: actions/setup-python@v4
187187
with:
188-
python-version: '3.7'
188+
python-version: '3.8'
189189
- name: Install python deps
190190
timeout-minutes: 10
191191
shell: bash
@@ -360,7 +360,7 @@ jobs:
360360
- name: Setup python
361361
uses: actions/setup-python@v4
362362
with:
363-
python-version: '3.7'
363+
python-version: '3.8'
364364
- name: Install python deps
365365
timeout-minutes: 10
366366
shell: bash
@@ -387,10 +387,10 @@ jobs:
387387
name: 'firebase_unity_sdk.zip'
388388
workflow: 'build_starter.yml'
389389
run_id: ${{ github.event.inputs.packaged_sdk_run_id }}
390-
- name: Set up Node (16)
390+
- name: Set up Node (18)
391391
uses: actions/setup-node@v3
392392
with:
393-
node-version: 16.x
393+
node-version: 18.x
394394
- name: Setup java for Firestore emulator
395395
uses: actions/setup-java@v3
396396
with:
@@ -483,7 +483,7 @@ jobs:
483483
- name: Setup python
484484
uses: actions/setup-python@v4
485485
with:
486-
python-version: '3.7'
486+
python-version: '3.8'
487487
- name: Install python deps
488488
timeout-minutes: 10
489489
shell: bash
@@ -493,11 +493,11 @@ jobs:
493493
with:
494494
path: testapps
495495
name: ${{ steps.matrix_info.outputs.artifact_path }}
496-
- name: Set up Node (16)
496+
- name: Set up Node (18)
497497
if: ${{ matrix.test_device == 'github_runner' }}
498498
uses: actions/setup-node@v3
499499
with:
500-
node-version: 16.x
500+
node-version: 18.x
501501
- name: Setup java for Firestore emulator
502502
if: ${{ matrix.test_device == 'github_runner' }}
503503
uses: actions/setup-java@v3

‎.github/workflows/package.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
- name: Setup Python
9494
uses: actions/setup-python@v4
9595
with:
96-
python-version: 3.7
96+
python-version: 3.8
9797

9898
- name: Install python deps
9999
shell: bash
@@ -276,7 +276,7 @@ jobs:
276276
- name: Setup python
277277
uses: actions/setup-python@v4
278278
with:
279-
python-version: 3.7
279+
python-version: 3.8
280280
- name: Generate token for GitHub API
281281
# This step is necessary because the existing GITHUB_TOKEN cannot be used inside one workflow to trigger another.
282282
#

‎.github/workflows/update_versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
- name: Setup Python
111111
uses: actions/setup-python@v4
112112
with:
113-
python-version: 3.7
113+
python-version: 3.8
114114

115115
- name: Install python deps
116116
shell: bash

‎cmake/android_dependencies.cmake

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,72 +15,72 @@
1515
# This file defines the Android dependencies needed by all the modules.
1616

1717
set(FIREBASE_APP_ANDROID_DEPS
18-
"com.google.firebase:firebase-common:20.3.3"
19-
"com.google.firebase:firebase-analytics:21.3.0"
20-
"com.google.android.gms:play-services-base:18.2.0"
18+
"com.google.firebase:firebase-common:20.4.2"
19+
"com.google.firebase:firebase-analytics:21.5.0"
20+
"com.google.android.gms:play-services-base:18.3.0"
2121
)
2222

2323
set(FIREBASE_ANALYTICS_ANDROID_DEPS
24-
"com.google.firebase:firebase-analytics:21.3.0"
24+
"com.google.firebase:firebase-analytics:21.5.0"
2525
)
2626

2727
set(FIREBASE_APP_CHECK_ANDROID_DEPS
28-
"com.google.firebase:firebase-appcheck:17.0.1"
29-
"com.google.firebase:firebase-appcheck-debug:17.0.1"
30-
"com.google.firebase:firebase-appcheck-playintegrity:17.0.1"
31-
"com.google.firebase:firebase-analytics:21.3.0"
28+
"com.google.firebase:firebase-appcheck:17.1.1"
29+
"com.google.firebase:firebase-appcheck-debug:17.1.1"
30+
"com.google.firebase:firebase-appcheck-playintegrity:17.1.1"
31+
"com.google.firebase:firebase-analytics:21.5.0"
3232
)
3333

3434
set(FIREBASE_AUTH_ANDROID_DEPS
35-
"com.google.firebase:firebase-auth:22.1.2"
36-
"com.google.firebase:firebase-analytics:21.3.0"
35+
"com.google.firebase:firebase-auth:22.3.1"
36+
"com.google.firebase:firebase-analytics:21.5.0"
3737
)
3838

3939
set(FIREBASE_CRASHLYTICS_ANDROID_DEPS
40-
"com.google.firebase:firebase-crashlytics-ndk:18.4.3"
41-
"com.google.firebase:firebase-analytics:21.3.0"
40+
"com.google.firebase:firebase-crashlytics-ndk:18.6.1"
41+
"com.google.firebase:firebase-analytics:21.5.0"
4242
)
4343

4444
set(FIREBASE_DATABASE_ANDROID_DEPS
45-
"com.google.firebase:firebase-database:20.2.2"
46-
"com.google.firebase:firebase-analytics:21.3.0"
47-
"com.google.android.gms:play-services-base:18.2.0"
45+
"com.google.firebase:firebase-database:20.3.0"
46+
"com.google.firebase:firebase-analytics:21.5.0"
47+
"com.google.android.gms:play-services-base:18.3.0"
4848
)
4949

5050
set(FIREBASE_DYNAMIC_LINKS_ANDROID_DEPS
51-
"com.google.firebase:firebase-dynamic-links:21.1.0"
52-
"com.google.firebase:firebase-analytics:21.3.0"
51+
"com.google.firebase:firebase-dynamic-links:21.2.0"
52+
"com.google.firebase:firebase-analytics:21.5.0"
5353
)
5454

5555
set(FIREBASE_FIRESTORE_ANDROID_DEPS
56-
"com.google.firebase:firebase-firestore:24.8.1"
57-
"com.google.firebase:firebase-analytics:21.3.0"
56+
"com.google.firebase:firebase-firestore:24.10.1"
57+
"com.google.firebase:firebase-analytics:21.5.0"
5858
)
5959

6060
set(FIREBASE_FUNCTIONS_ANDROID_DEPS
61-
"com.google.firebase:firebase-functions:20.3.1"
62-
"com.google.firebase:firebase-analytics:21.3.0"
61+
"com.google.firebase:firebase-functions:20.4.0"
62+
"com.google.firebase:firebase-analytics:21.5.0"
6363
)
6464

6565
set(FIREBASE_INSTALLATIONS_ANDROID_DEPS
66-
"com.google.firebase:firebase-installations:17.1.4"
67-
"com.google.firebase:firebase-analytics:21.3.0"
66+
"com.google.firebase:firebase-installations:17.2.0"
67+
"com.google.firebase:firebase-analytics:21.5.0"
6868
)
6969

7070
# iid is needed by messaging to avoid a conflict with functions
7171
set(FIREBASE_MESSAGING_ANDROID_DEPS
72-
"com.google.firebase:firebase-messaging:23.2.1"
73-
"com.google.firebase:firebase-analytics:21.3.0"
72+
"com.google.firebase:firebase-messaging:23.4.0"
73+
"com.google.firebase:firebase-analytics:21.5.0"
7474
"com.google.firebase:firebase-iid:21.1.0"
7575
"com.google.flatbuffers:flatbuffers-java:1.12.0"
7676
)
7777

7878
set(FIREBASE_REMOTE_CONFIG_ANDROID_DEPS
79-
"com.google.firebase:firebase-config:21.4.1"
80-
"com.google.firebase:firebase-analytics:21.3.0"
79+
"com.google.firebase:firebase-config:21.6.0"
80+
"com.google.firebase:firebase-analytics:21.5.0"
8181
)
8282

8383
set(FIREBASE_STORAGE_ANDROID_DEPS
84-
"com.google.firebase:firebase-storage:20.2.1"
85-
"com.google.firebase:firebase-analytics:21.3.0"
84+
"com.google.firebase:firebase-storage:20.3.0"
85+
"com.google.firebase:firebase-analytics:21.5.0"
8686
)

‎cmake/firebase_unity_version.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
set(FIREBASE_UNITY_SDK_VERSION "11.6.0"
1818
CACHE STRING "The version of the Unity SDK, used in the names of files.")
1919

20-
set(FIREBASE_IOS_POD_VERSION "10.16.0"
20+
set(FIREBASE_IOS_POD_VERSION "10.20.0"
2121
CACHE STRING "The version of the top-level Firebase Cocoapod to use.")
2222

2323
# https://github.com/googlesamples/unity-jar-resolver
@@ -27,7 +27,7 @@ set(FIREBASE_UNITY_JAR_RESOLVER_VERSION "1.2.177"
2727
)
2828

2929
# https://github.com/firebase/firebase-cpp-sdk
30-
set(FIREBASE_CPP_SDK_PRESET_VERSION "v11.6.0"
30+
set(FIREBASE_CPP_SDK_PRESET_VERSION "v11.8.0"
3131
CACHE STRING
3232
"Version tag of Firebase CPP SDK to download (if no local or not passed in) and use (no trailing .0)"
3333
)

‎docs/readme.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,12 @@ Support
7171

7272
Release Notes
7373
-------------
74+
### Upcoming
75+
- Changes
76+
- General: Update to Firebase C++ SDK version 11.8.0.
77+
- General (Android): Update to Firebase Android BoM version 32.7.1.
78+
- General (iOS): Update to Firebase Cocoapods version 10.20.0.
79+
7480
### 11.6.0
7581
- Changes
7682
- General: Update to Firebase C++ SDK version 11.6.0.

‎scripts/gha/build_testapps.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,7 @@ def patch_android_env(unity_version):
548548
# This is a bug from Unity:
549549
# https://issuetracker.unity3d.com/issues/android-android-build-fails-when-targeting-sdk-31-and-using-build-tools-31-dot-0-0
550550
_run([sdkmanager_path, "--uninstall", "build-tools;31.0.0"], check=False)
551+
_run([sdkmanager_path, "--install", "build-tools;30.0.2"])
551552
logging.info("Uninstall Android build tool 31.0.0")
552553
except Exception as e:
553554
logging.info(str(e))

0 commit comments

Comments
 (0)