Skip to content

Commit b1695dd

Browse files
a-mauricea-maurice
committed
Merge branch 'main' into am-auth_cleanup
2 parents d3602af + 403a6dd commit b1695dd

File tree

10 files changed

+90
-38
lines changed

10 files changed

+90
-38
lines changed

‎.github/workflows/build_android.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ on:
3838
jobs:
3939
build_android:
4040
name: build-android-unity${{ inputs.unity_version }}-CPP${{ inputs.firebase_cpp_sdk_version }}
41-
runs-on: macos-12
41+
runs-on: macos-13
4242
strategy:
4343
fail-fast: false
4444
env:
@@ -94,6 +94,11 @@ jobs:
9494
cd ..
9595
echo "NDK_ROOT=/tmp/android-ndk-r21e" >> $GITHUB_ENV
9696
echo "ANDROID_NDK_HOME=/tmp/android-ndk-r21e" >> $GITHUB_ENV
97+
brew install [email protected]
98+
99+
- name: Force Java 8 (macOS)
100+
shell: bash
101+
run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV
97102

98103
- name: Install python deps
99104
shell: bash

‎.github/workflows/build_ios.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ on:
3838
jobs:
3939
build_ios:
4040
name: build-ios-unity${{ inputs.unity_version }}-CPP${{ inputs.firebase_cpp_sdk_version }}
41-
runs-on: macos-12
41+
runs-on: macos-13
4242
strategy:
4343
fail-fast: false
4444

4545
env:
46-
xcodeVersion: "14.1"
46+
xcodeVersion: "15.1"
4747

4848
steps:
4949
- name: Checkout Unity Repo
@@ -77,6 +77,7 @@ jobs:
7777
cd firebase-cpp-sdk
7878
python scripts/gha/install_prereqs_desktop.py
7979
cd ..
80+
brew install [email protected]
8081
8182
- name: Install python deps
8283
shell: bash

‎.github/workflows/build_macos.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ on:
3838
jobs:
3939
build_desktop:
4040
name: build-macOS-unity${{ inputs.unity_version}}-CPP${{ inputs.firebase_cpp_sdk_version }}
41-
runs-on: macos-12
41+
runs-on: macos-13
4242
strategy:
4343
fail-fast: false
4444

@@ -81,6 +81,7 @@ jobs:
8181
cd firebase-cpp-sdk
8282
python scripts/gha/install_prereqs_desktop.py
8383
cd ..
84+
brew install [email protected]
8485
8586
- name: Install python deps
8687
shell: bash

‎.github/workflows/build_tvos.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ on:
5959
jobs:
6060
build_tvos:
6161
name: build-tvos-unity${{ inputs.unity_version }}-CPP${{ inputs.firebase_cpp_sdk_version }}
62-
runs-on: macos-12
62+
runs-on: macos-13
6363
strategy:
6464
fail-fast: false
6565

6666
env:
67-
xcodeVersion: "14.1"
67+
xcodeVersion: "15.1"
6868

6969
steps:
7070
- name: Checkout Unity Repo
@@ -98,6 +98,7 @@ jobs:
9898
cd firebase-cpp-sdk
9999
python scripts/gha/install_prereqs_desktop.py
100100
cd ..
101+
brew install [email protected]
101102
102103
- name: Install python deps
103104
shell: bash

‎.github/workflows/integration_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ jobs:
174174
fail-fast: false
175175
matrix: ${{ fromJson(needs.check_and_prepare.outputs.build_matrix) }}
176176
env:
177-
xcodeVersion: "14.1"
177+
xcodeVersion: "15.1"
178178
steps:
179179
- id: matrix_info
180180
shell: bash

‎cmake/android_dependencies.cmake

Lines changed: 27 additions & 27 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.4.3"
19-
"com.google.firebase:firebase-analytics:21.6.2"
18+
"com.google.firebase:firebase-common:21.0.0"
19+
"com.google.firebase:firebase-analytics:22.0.0"
2020
"com.google.android.gms:play-services-base:18.4.0"
2121
)
2222

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

2727
set(FIREBASE_APP_CHECK_ANDROID_DEPS
28-
"com.google.firebase:firebase-appcheck:17.1.2"
29-
"com.google.firebase:firebase-appcheck-debug:17.1.2"
30-
"com.google.firebase:firebase-appcheck-playintegrity:17.1.2"
31-
"com.google.firebase:firebase-analytics:21.6.2"
28+
"com.google.firebase:firebase-appcheck:18.0.0"
29+
"com.google.firebase:firebase-appcheck-debug:18.0.0"
30+
"com.google.firebase:firebase-appcheck-playintegrity:18.0.0"
31+
"com.google.firebase:firebase-analytics:22.0.0"
3232
)
3333

3434
set(FIREBASE_AUTH_ANDROID_DEPS
35-
"com.google.firebase:firebase-auth:22.3.1"
36-
"com.google.firebase:firebase-analytics:21.6.2"
35+
"com.google.firebase:firebase-auth:23.0.0"
36+
"com.google.firebase:firebase-analytics:22.0.0"
3737
)
3838

3939
set(FIREBASE_CRASHLYTICS_ANDROID_DEPS
40-
"com.google.firebase:firebase-crashlytics-ndk:18.6.4"
41-
"com.google.firebase:firebase-analytics:21.6.2"
40+
"com.google.firebase:firebase-crashlytics-ndk:19.0.0"
41+
"com.google.firebase:firebase-analytics:22.0.0"
4242
)
4343

4444
set(FIREBASE_DATABASE_ANDROID_DEPS
45-
"com.google.firebase:firebase-database:20.3.1"
46-
"com.google.firebase:firebase-analytics:21.6.2"
45+
"com.google.firebase:firebase-database:21.0.0"
46+
"com.google.firebase:firebase-analytics:22.0.0"
4747
"com.google.android.gms:play-services-base:18.4.0"
4848
)
4949

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

5555
set(FIREBASE_FIRESTORE_ANDROID_DEPS
56-
"com.google.firebase:firebase-firestore:24.11.1"
57-
"com.google.firebase:firebase-analytics:21.6.2"
56+
"com.google.firebase:firebase-firestore:25.0.0"
57+
"com.google.firebase:firebase-analytics:22.0.0"
5858
)
5959

6060
set(FIREBASE_FUNCTIONS_ANDROID_DEPS
61-
"com.google.firebase:firebase-functions:20.4.0"
62-
"com.google.firebase:firebase-analytics:21.6.2"
61+
"com.google.firebase:firebase-functions:21.0.0"
62+
"com.google.firebase:firebase-analytics:22.0.0"
6363
)
6464

6565
set(FIREBASE_INSTALLATIONS_ANDROID_DEPS
66-
"com.google.firebase:firebase-installations:17.2.0"
67-
"com.google.firebase:firebase-analytics:21.6.2"
66+
"com.google.firebase:firebase-installations:18.0.0"
67+
"com.google.firebase:firebase-analytics:22.0.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.4.1"
73-
"com.google.firebase:firebase-analytics:21.6.2"
72+
"com.google.firebase:firebase-messaging:24.0.0"
73+
"com.google.firebase:firebase-analytics:22.0.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.6.3"
80-
"com.google.firebase:firebase-analytics:21.6.2"
79+
"com.google.firebase:firebase-config:22.0.0"
80+
"com.google.firebase:firebase-analytics:22.0.0"
8181
)
8282

8383
set(FIREBASE_STORAGE_ANDROID_DEPS
84-
"com.google.firebase:firebase-storage:20.3.0"
85-
"com.google.firebase:firebase-analytics:21.6.2"
84+
"com.google.firebase:firebase-storage:21.0.0"
85+
"com.google.firebase:firebase-analytics:22.0.0"
8686
)

‎cmake/firebase_unity_version.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
# This file defines the version numbers used by the Firebase Unity SDK.
1616

17-
set(FIREBASE_UNITY_SDK_VERSION "11.9.0"
17+
set(FIREBASE_UNITY_SDK_VERSION "12.0.0"
1818
CACHE STRING "The version of the Unity SDK, used in the names of files.")
1919

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

2323
# https://github.com/googlesamples/unity-jar-resolver

‎firestore/src/Converters/AttributedTypeConverter.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ override object DeserializeMap(DeserializationContext context, FieldValueProxy m
136136
"No writable property for Firestore field {0} in type {1}", key, TargetType.FullName));
137137
break;
138138
case UnknownPropertyHandling.Throw:
139-
throw new ArgumentException(String.Format("No writable property for Firestore field {key} in type {0}", TargetType.FullName));
139+
throw new ArgumentException(String.Format(
140+
"No writable property for Firestore field {0} in type {1}", key, TargetType.FullName));
140141
}
141142
}
142143
}

‎scripts/gha/print_matrix_configuration.py

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

5757
# GitHub Runner
5858
WINDOWS_RUNNER = "windows-latest"
59-
MACOS_RUNNER = "macos-12"
59+
MACOS_RUNNER = "macos-13"
6060
LINUX_RUNNER = "ubuntu-latest"
6161

6262
PARAMETERS = {

‎unity_packer/guids.json

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,6 +1087,49 @@
10871087
"Firebase/m2repository/com/google/firebase/firebase-storage-unity/11.9.0/firebase-storage-unity-11.9.0.pom": "b0108f34961742d9be211188f6dbf946",
10881088
"Firebase/m2repository/com/google/firebase/firebase-storage-unity/11.9.0/firebase-storage-unity-11.9.0.srcaar": "c0716eda2011457abafb685fb51194a2"
10891089
},
1090+
"12.0.0": {
1091+
"Firebase/Editor/FirebaseAnalytics_version-12.0.0_manifest.txt": "fd1985c3b3f94d62a89292d705c52527",
1092+
"Firebase/Editor/FirebaseAppCheck_version-12.0.0_manifest.txt": "659d33f6c055419d8152810916463a26",
1093+
"Firebase/Editor/FirebaseAuth_version-12.0.0_manifest.txt": "2ff051acf13f4744a8f3f8dee69f8ef5",
1094+
"Firebase/Editor/FirebaseCrashlytics_version-12.0.0_manifest.txt": "b77effb37db7490a9a1068a27150ef4e",
1095+
"Firebase/Editor/FirebaseDatabase_version-12.0.0_manifest.txt": "e6f720738f4143a0b860e13eca491581",
1096+
"Firebase/Editor/FirebaseDynamicLinks_version-12.0.0_manifest.txt": "85c2428f12154709bede64fbbcea9e38",
1097+
"Firebase/Editor/FirebaseFirestore_version-12.0.0_manifest.txt": "67628c2eb7d84dbab376d8d5dcc4e1b0",
1098+
"Firebase/Editor/FirebaseFunctions_version-12.0.0_manifest.txt": "3d3e22daf1c746faa2048471681d6596",
1099+
"Firebase/Editor/FirebaseInstallations_version-12.0.0_manifest.txt": "466d765d69c94f11abdcfd63b0947d3e",
1100+
"Firebase/Editor/FirebaseMessaging_version-12.0.0_manifest.txt": "8c76ca88a3ad429ebde8456ab144ed32",
1101+
"Firebase/Editor/FirebaseRemoteConfig_version-12.0.0_manifest.txt": "8a356e7a440442dc8e94690687b1a47c",
1102+
"Firebase/Editor/FirebaseStorage_version-12.0.0_manifest.txt": "7e6300d6764345d18875f990de8e4a82",
1103+
"Firebase/Plugins/x86_64/FirebaseCppApp-12_0_0.bundle": "6ad99ac4495c43129b95a4570611f782",
1104+
"Firebase/Plugins/x86_64/FirebaseCppApp-12_0_0.dll": "1de9fc935cdf4a1e8f6f40531134424e",
1105+
"Firebase/Plugins/x86_64/FirebaseCppApp-12_0_0.so": "67322a67d8cd4be99e1f61482ac2c8b4",
1106+
"Firebase/m2repository/com/google/firebase/firebase-analytics-unity/12.0.0/firebase-analytics-unity-12.0.0.pom": "4c6cab3acf7748d7b3a17b15edebae2b",
1107+
"Firebase/m2repository/com/google/firebase/firebase-analytics-unity/12.0.0/firebase-analytics-unity-12.0.0.srcaar": "7750e8194aaf42d4a2d2d0a028fa47fd",
1108+
"Firebase/m2repository/com/google/firebase/firebase-app-unity/12.0.0/firebase-app-unity-12.0.0.pom": "93f50424394f461eb4453bb358b2bb53",
1109+
"Firebase/m2repository/com/google/firebase/firebase-app-unity/12.0.0/firebase-app-unity-12.0.0.srcaar": "4063709f1922440ca2210232e2119095",
1110+
"Firebase/m2repository/com/google/firebase/firebase-appcheck-unity/12.0.0/firebase-appcheck-unity-12.0.0.pom": "d529bafc0dcd43c190c7b4dc65cea884",
1111+
"Firebase/m2repository/com/google/firebase/firebase-appcheck-unity/12.0.0/firebase-appcheck-unity-12.0.0.srcaar": "adcc2f8e392441a1899a37df9f2e3928",
1112+
"Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.0.0/firebase-auth-unity-12.0.0.pom": "1b60b542ac654b208df33ecb9fac7812",
1113+
"Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.0.0/firebase-auth-unity-12.0.0.srcaar": "acdd37577e5d48bb94cc6547174392dd",
1114+
"Firebase/m2repository/com/google/firebase/firebase-config-unity/12.0.0/firebase-config-unity-12.0.0.pom": "06efc51386e3419abc1c5da72a3acaaa",
1115+
"Firebase/m2repository/com/google/firebase/firebase-config-unity/12.0.0/firebase-config-unity-12.0.0.srcaar": "d8d10c4332554b48b61411b8c513e6e6",
1116+
"Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/12.0.0/firebase-crashlytics-unity-12.0.0.pom": "e7a05826d6a64e8a9b4fcfc151f5620d",
1117+
"Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/12.0.0/firebase-crashlytics-unity-12.0.0.srcaar": "bb6f0dfc3ad043f1a012ab6a95da9930",
1118+
"Firebase/m2repository/com/google/firebase/firebase-database-unity/12.0.0/firebase-database-unity-12.0.0.pom": "78332c288d2e434db93210cfa92052e8",
1119+
"Firebase/m2repository/com/google/firebase/firebase-database-unity/12.0.0/firebase-database-unity-12.0.0.srcaar": "15efc7114e924fa5829b98800f8de08f",
1120+
"Firebase/m2repository/com/google/firebase/firebase-dynamic-links-unity/12.0.0/firebase-dynamic-links-unity-12.0.0.pom": "dc3c4e10a24642cfa15e7e56752c997d",
1121+
"Firebase/m2repository/com/google/firebase/firebase-dynamic-links-unity/12.0.0/firebase-dynamic-links-unity-12.0.0.srcaar": "bf8aacb6268541399721a1a9051e1bea",
1122+
"Firebase/m2repository/com/google/firebase/firebase-firestore-unity/12.0.0/firebase-firestore-unity-12.0.0.pom": "fddbfaefef6948098626184e36c6c4c5",
1123+
"Firebase/m2repository/com/google/firebase/firebase-firestore-unity/12.0.0/firebase-firestore-unity-12.0.0.srcaar": "0857e32bf76f4ab29b6ecb4b02fad0a2",
1124+
"Firebase/m2repository/com/google/firebase/firebase-functions-unity/12.0.0/firebase-functions-unity-12.0.0.pom": "2172ad72f4e240f9aba21fe3f6c6be9f",
1125+
"Firebase/m2repository/com/google/firebase/firebase-functions-unity/12.0.0/firebase-functions-unity-12.0.0.srcaar": "f6856b25d5664caea523f7176a3613a3",
1126+
"Firebase/m2repository/com/google/firebase/firebase-installations-unity/12.0.0/firebase-installations-unity-12.0.0.pom": "c7b2d5b74e394ed597cb8ef5bc461991",
1127+
"Firebase/m2repository/com/google/firebase/firebase-installations-unity/12.0.0/firebase-installations-unity-12.0.0.srcaar": "34e371a2bd6e476dabaa11ff971daef3",
1128+
"Firebase/m2repository/com/google/firebase/firebase-messaging-unity/12.0.0/firebase-messaging-unity-12.0.0.pom": "7b3afeee77d44ca5b8322e8429d40c29",
1129+
"Firebase/m2repository/com/google/firebase/firebase-messaging-unity/12.0.0/firebase-messaging-unity-12.0.0.srcaar": "2b6972c53d4043f090db89d36e85cca2",
1130+
"Firebase/m2repository/com/google/firebase/firebase-storage-unity/12.0.0/firebase-storage-unity-12.0.0.pom": "3d88a456d2be444da7deada87f19d502",
1131+
"Firebase/m2repository/com/google/firebase/firebase-storage-unity/12.0.0/firebase-storage-unity-12.0.0.srcaar": "8096b403f95146ce8d66a4fd71d39dfc"
1132+
},
10901133
"3.0.0": {
10911134
"Firebase/Editor/FirebaseAnalytics_v3.0.0_manifest.txt": "13c9ba8e35174de78ad7ca9a48cba9f0",
10921135
"Firebase/Editor/FirebaseAuth_v3.0.0_manifest.txt": "eaa139bec35e491da653b612e67134ad",

0 commit comments

Comments
 (0)