Skip to content

Commit 9b3994a

Browse files
a-mauricea-maurice
authored
Merge branch 'main' into am-spm_update
2 parents 70c115e + 97d77cf commit 9b3994a

4 files changed

Lines changed: 62 additions & 20 deletions

File tree

‎cmake/android_dependencies.cmake‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,66 +16,66 @@
1616

1717
set(FIREBASE_APP_ANDROID_DEPS
1818
"com.google.firebase:firebase-common:22.0.1"
19-
"com.google.firebase:firebase-analytics:23.0.0"
19+
"com.google.firebase:firebase-analytics:23.2.0"
2020
"com.google.android.gms:play-services-base:18.10.0"
2121
)
2222

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

2727
set(FIREBASE_APP_CHECK_ANDROID_DEPS
2828
"com.google.firebase:firebase-appcheck:19.0.2"
2929
"com.google.firebase:firebase-appcheck-debug:19.0.2"
3030
"com.google.firebase:firebase-appcheck-playintegrity:19.0.2"
31-
"com.google.firebase:firebase-analytics:23.0.0"
31+
"com.google.firebase:firebase-analytics:23.2.0"
3232
)
3333

3434
set(FIREBASE_AUTH_ANDROID_DEPS
3535
"com.google.firebase:firebase-auth:24.0.1"
36-
"com.google.firebase:firebase-analytics:23.0.0"
36+
"com.google.firebase:firebase-analytics:23.2.0"
3737
)
3838

3939
set(FIREBASE_CRASHLYTICS_ANDROID_DEPS
40-
"com.google.firebase:firebase-crashlytics-ndk:20.0.4"
41-
"com.google.firebase:firebase-analytics:23.0.0"
40+
"com.google.firebase:firebase-crashlytics-ndk:20.0.5"
41+
"com.google.firebase:firebase-analytics:23.2.0"
4242
)
4343

4444
set(FIREBASE_DATABASE_ANDROID_DEPS
4545
"com.google.firebase:firebase-database:22.0.1"
46-
"com.google.firebase:firebase-analytics:23.0.0"
46+
"com.google.firebase:firebase-analytics:23.2.0"
4747
"com.google.android.gms:play-services-base:18.10.0"
4848
)
4949

5050
set(FIREBASE_FIRESTORE_ANDROID_DEPS
51-
"com.google.firebase:firebase-firestore:26.1.1"
52-
"com.google.firebase:firebase-analytics:23.0.0"
51+
"com.google.firebase:firebase-firestore:26.2.0"
52+
"com.google.firebase:firebase-analytics:23.2.0"
5353
)
5454

5555
set(FIREBASE_FUNCTIONS_ANDROID_DEPS
56-
"com.google.firebase:firebase-functions:22.1.0"
57-
"com.google.firebase:firebase-analytics:23.0.0"
56+
"com.google.firebase:firebase-functions:22.1.1"
57+
"com.google.firebase:firebase-analytics:23.2.0"
5858
)
5959

6060
set(FIREBASE_INSTALLATIONS_ANDROID_DEPS
6161
"com.google.firebase:firebase-installations:19.1.0"
62-
"com.google.firebase:firebase-analytics:23.0.0"
62+
"com.google.firebase:firebase-analytics:23.2.0"
6363
)
6464

6565
# iid is needed by messaging to avoid a conflict with functions
6666
set(FIREBASE_MESSAGING_ANDROID_DEPS
6767
"com.google.firebase:firebase-messaging:25.0.1"
68-
"com.google.firebase:firebase-analytics:23.0.0"
68+
"com.google.firebase:firebase-analytics:23.2.0"
6969
"com.google.firebase:firebase-iid:21.1.0"
7070
"com.google.flatbuffers:flatbuffers-java:1.12.0"
7171
)
7272

7373
set(FIREBASE_REMOTE_CONFIG_ANDROID_DEPS
7474
"com.google.firebase:firebase-config:23.0.1"
75-
"com.google.firebase:firebase-analytics:23.0.0"
75+
"com.google.firebase:firebase-analytics:23.2.0"
7676
)
7777

7878
set(FIREBASE_STORAGE_ANDROID_DEPS
7979
"com.google.firebase:firebase-storage:22.0.1"
80-
"com.google.firebase:firebase-analytics:23.0.0"
80+
"com.google.firebase:firebase-analytics:23.2.0"
8181
)

‎cmake/firebase_unity_version.cmake‎

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

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

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

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

23-
set(FIREBASE_SPM_VERSION "12.10.0"
23+
set(FIREBASE_SPM_VERSION "12.12.0"
2424
CACHE STRING "The version of the top-level Firebase Swift Package to use.")
2525

2626
# https://github.com/googlesamples/unity-jar-resolver
@@ -30,7 +30,7 @@ set(FIREBASE_UNITY_JAR_RESOLVER_VERSION "1.2.187"
3030
)
3131

3232
# https://github.com/firebase/firebase-cpp-sdk
33-
set(FIREBASE_CPP_SDK_PRESET_VERSION "v13.5.0"
33+
set(FIREBASE_CPP_SDK_PRESET_VERSION "v13.6.0"
3434
CACHE STRING
3535
"Version tag of Firebase CPP SDK to download (if no local or not passed in) and use (no trailing .0)"
3636
)

‎docs/readme.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,11 @@ Support
109109

110110
Release Notes
111111
-------------
112-
### Upcoming
112+
### 13.10.0
113113
- Changes
114+
- General: Update to Firebase C++ SDK version 13.6.0.
115+
- General (Android): Update to Firebase Android BoM version 34.12.0.
116+
- General (iOS): Update to Firebase Cocoapods version 12.12.0.
114117
- Firebase AI: All Imagen models are deprecated and will shut down as early
115118
as June 2026. As a replacement, you can
116119
[migrate your apps to use Gemini Image models (the "Nano Banana" models)](https://firebase.google.com/docs/ai-logic/imagen-models-migration).

‎unity_packer/guids.json‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1779,6 +1779,45 @@
17791779
"Firebase/m2repository/com/google/firebase/firebase-storage-unity/13.1.0/firebase-storage-unity-13.1.0.pom": "51d0b8a1575c4d95bca8efe6965be05c",
17801780
"Firebase/m2repository/com/google/firebase/firebase-storage-unity/13.1.0/firebase-storage-unity-13.1.0.srcaar": "1ff552b159d84fa4bd3473a8ef4dfc83"
17811781
},
1782+
"13.10.0": {
1783+
"Firebase/Editor/FirebaseAI_version-13.10.0_manifest.txt": "9ddaecd96f364b608665a315193ecec3",
1784+
"Firebase/Editor/FirebaseAnalytics_version-13.10.0_manifest.txt": "2ab5384193fd438ab01b91c5946c4d11",
1785+
"Firebase/Editor/FirebaseAppCheck_version-13.10.0_manifest.txt": "9b9c7353654b43cebf135441d3493446",
1786+
"Firebase/Editor/FirebaseAuth_version-13.10.0_manifest.txt": "fd06d3d8c6034a32858b9c53ccd4f5af",
1787+
"Firebase/Editor/FirebaseCrashlytics_version-13.10.0_manifest.txt": "38196e76a3c94225a607ed1c15c9be27",
1788+
"Firebase/Editor/FirebaseDatabase_version-13.10.0_manifest.txt": "1338178dbb3d4e92a8dd5ac6f5370732",
1789+
"Firebase/Editor/FirebaseFirestore_version-13.10.0_manifest.txt": "4cf3893949f7461686a5df3342fe6a85",
1790+
"Firebase/Editor/FirebaseFunctions_version-13.10.0_manifest.txt": "f693184a85f1441db7f5fa90bd20a498",
1791+
"Firebase/Editor/FirebaseInstallations_version-13.10.0_manifest.txt": "d0424ef9a5ec40d68717e3b2761fadc5",
1792+
"Firebase/Editor/FirebaseMessaging_version-13.10.0_manifest.txt": "1868c3fd258c4803891a4a22901a59b5",
1793+
"Firebase/Editor/FirebaseRemoteConfig_version-13.10.0_manifest.txt": "deb82fbd739a486e8a195a19eaa1a218",
1794+
"Firebase/Editor/FirebaseStorage_version-13.10.0_manifest.txt": "9371c7ab79ca43eea0a786e34688f1ca",
1795+
"Firebase/Plugins/x86_64/FirebaseCppApp-13_10_0.bundle": "c497e3d71dd84767a743206711828696",
1796+
"Firebase/Plugins/x86_64/FirebaseCppApp-13_10_0.dll": "93b728fbe86741148555cf32e7e0e50d",
1797+
"Firebase/Plugins/x86_64/FirebaseCppApp-13_10_0.so": "8bd5639441984c36a217fc80c8209ab4",
1798+
"Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.10.0/firebase-analytics-unity-13.10.0.pom": "a90a7a848d03412280b575fdb0b96f0b",
1799+
"Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.10.0/firebase-analytics-unity-13.10.0.srcaar": "9e4d8fc4257744ba9daf73dd612709c8",
1800+
"Firebase/m2repository/com/google/firebase/firebase-app-unity/13.10.0/firebase-app-unity-13.10.0.pom": "df3b9248208141129f17b940b2698da3",
1801+
"Firebase/m2repository/com/google/firebase/firebase-app-unity/13.10.0/firebase-app-unity-13.10.0.srcaar": "a82bc06c72804dc6a3819c4eb569b08c",
1802+
"Firebase/m2repository/com/google/firebase/firebase-appcheck-unity/13.10.0/firebase-appcheck-unity-13.10.0.pom": "03324ad45b434fd3a32d3eb63df9796b",
1803+
"Firebase/m2repository/com/google/firebase/firebase-appcheck-unity/13.10.0/firebase-appcheck-unity-13.10.0.srcaar": "f3f594f21dcb4cf7a4795b00366d7b12",
1804+
"Firebase/m2repository/com/google/firebase/firebase-auth-unity/13.10.0/firebase-auth-unity-13.10.0.pom": "d08d710e301d4528b80d097a2cca9048",
1805+
"Firebase/m2repository/com/google/firebase/firebase-auth-unity/13.10.0/firebase-auth-unity-13.10.0.srcaar": "6a8ce0936bab4465b452f6dde1f39d89",
1806+
"Firebase/m2repository/com/google/firebase/firebase-config-unity/13.10.0/firebase-config-unity-13.10.0.pom": "c7aff642a3fd436094900713d5500a2a",
1807+
"Firebase/m2repository/com/google/firebase/firebase-config-unity/13.10.0/firebase-config-unity-13.10.0.srcaar": "614b543048764a74bfd876b19be87c30",
1808+
"Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.10.0/firebase-crashlytics-unity-13.10.0.pom": "28189da1ff3f45688f57083799060f9a",
1809+
"Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/13.10.0/firebase-crashlytics-unity-13.10.0.srcaar": "01978c9c00244f1a83fd7449c9278bac",
1810+
"Firebase/m2repository/com/google/firebase/firebase-database-unity/13.10.0/firebase-database-unity-13.10.0.pom": "36103d72cea844a8abb21a268ccd92b3",
1811+
"Firebase/m2repository/com/google/firebase/firebase-database-unity/13.10.0/firebase-database-unity-13.10.0.srcaar": "cd0c56afada14e89aa2abc83fc61638a",
1812+
"Firebase/m2repository/com/google/firebase/firebase-firestore-unity/13.10.0/firebase-firestore-unity-13.10.0.pom": "1261c436c48d42dba52574bbc2ca3c46",
1813+
"Firebase/m2repository/com/google/firebase/firebase-firestore-unity/13.10.0/firebase-firestore-unity-13.10.0.srcaar": "3a4705d652384260a04234a14919526e",
1814+
"Firebase/m2repository/com/google/firebase/firebase-installations-unity/13.10.0/firebase-installations-unity-13.10.0.pom": "d8ee152832aa4b26b8ae78e440e0e594",
1815+
"Firebase/m2repository/com/google/firebase/firebase-installations-unity/13.10.0/firebase-installations-unity-13.10.0.srcaar": "ed7c8104cb584083bda4f2767340ffe9",
1816+
"Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.10.0/firebase-messaging-unity-13.10.0.pom": "8136b2d0f020456f88a47a261655e0c6",
1817+
"Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.10.0/firebase-messaging-unity-13.10.0.srcaar": "16d5c73db3204321a1ab6ddb397a8bfa",
1818+
"Firebase/m2repository/com/google/firebase/firebase-storage-unity/13.10.0/firebase-storage-unity-13.10.0.pom": "2be8dbfa3e0c429e945c3c72d64a4c42",
1819+
"Firebase/m2repository/com/google/firebase/firebase-storage-unity/13.10.0/firebase-storage-unity-13.10.0.srcaar": "d091524355de41b7b0d2711a42bf3e07"
1820+
},
17821821
"13.2.0": {
17831822
"Firebase/Editor/FirebaseAI_version-13.2.0_manifest.txt": "724160d3ae0141bc88936d552a217965",
17841823
"Firebase/Editor/FirebaseAnalytics_version-13.2.0_manifest.txt": "e9b5d02debe744ba814e1f4852c7678b",

0 commit comments

Comments
 (0)