firebase · jonsimantov · Sep 27, 2023 · Jul 19, 2023 · Jul 20, 2023 · Jul 23, 2023
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
@@ -1046,6 +1046,7 @@ jobs:
           test_devices: ${{ steps.device-info.outputs.device }}
           max_attempts: 3
           validator: ${GITHUB_WORKSPACE}/scripts/gha/integration_testing/ftl_gha_validator.py
+          additional_flags: '--client-details matrixLabel=android-${{ github.run_id }}-${{ matrix.build_os }}-${{ matrix.android_device }}'
       - name: Read FTL Test Result
         if: ${{ steps.device-info.outputs.device_type == 'ftl' && !cancelled() }}
         shell: bash
@@ -1189,6 +1190,7 @@ jobs:
           test_devices: ${{ steps.device-info.outputs.device }}
           max_attempts: 3
           validator: ${GITHUB_WORKSPACE}/scripts/gha/integration_testing/ftl_gha_validator.py
+          additional_flags: '--client-details matrixLabel=ios-${{ github.run_id }}-${{ matrix.build_os }}-${{ matrix.ios_device }}'
       - name: Read FTL Test Result
         if: ${{ steps.device-info.outputs.device_type == 'ftl' && !cancelled() }}
         shell: bash

diff --git a/Android/firebase_dependencies.gradle b/Android/firebase_dependencies.gradle
@@ -159,7 +159,7 @@ project.afterEvaluate {
 
     // Add the bill-of-materials
     project.dependencies {
-      implementation platform('com.google.firebase:firebase-bom:32.2.3')
+      implementation platform('com.google.firebase:firebase-bom:32.3.1')
     }
     for (String lib : firebaseCpp.dependencies.libSet) {
       // Generate and include the proguard file

diff --git a/analytics/integration_test/Podfile b/analytics/integration_test/Podfile
@@ -5,12 +5,12 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '11.0'
-  pod 'Firebase/Analytics', '10.14.0'
+  pod 'Firebase/Analytics', '10.15.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Analytics', '10.14.0'
+  pod 'Firebase/Analytics', '10.15.0'
 end
 
 post_install do |installer|

diff --git a/analytics/ios_headers/FIREventNames.h b/analytics/ios_headers/FIREventNames.h
@@ -1,6 +1,6 @@
 // Copyright 2023 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 10.14.0.
+// Copied from Firebase Analytics iOS SDK 10.15.0.
 
 /// @file FIREventNames.h
 ///

diff --git a/analytics/ios_headers/FIRParameterNames.h b/analytics/ios_headers/FIRParameterNames.h
@@ -1,6 +1,6 @@
 // Copyright 2023 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 10.14.0.
+// Copied from Firebase Analytics iOS SDK 10.15.0.
 
 /// @file FIRParameterNames.h
 ///

diff --git a/analytics/ios_headers/FIRUserPropertyNames.h b/analytics/ios_headers/FIRUserPropertyNames.h
@@ -1,6 +1,6 @@
 // Copyright 2023 Google LLC
 
-// Copied from Firebase Analytics iOS SDK 10.14.0.
+// Copied from Firebase Analytics iOS SDK 10.15.0.
 
 /// @file FIRUserPropertyNames.h
 ///

diff --git a/app/app_resources/build.gradle b/app/app_resources/build.gradle
@@ -50,7 +50,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.2.3')
+  implementation platform('com.google.firebase:firebase-bom:32.3.1')
   implementation 'com.google.firebase:firebase-analytics'
 }
 

diff --git a/app/google_api_resources/build.gradle b/app/google_api_resources/build.gradle
@@ -53,7 +53,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.2.3')
+  implementation platform('com.google.firebase:firebase-bom:32.3.1')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.android.gms:play-services-base:18.2.0'
   implementation project(':app:app_resources')

diff --git a/app/integration_test/Podfile b/app/integration_test/Podfile
@@ -4,7 +4,7 @@ platform :ios, '11.0'
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  pod 'Firebase/Analytics', '10.14.0'
+  pod 'Firebase/Analytics', '10.15.0'
 end
 
 post_install do |installer|

diff --git a/app/invites_resources/build.gradle b/app/invites_resources/build.gradle
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.2.3')
+  implementation platform('com.google.firebase:firebase-bom:32.3.1')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-dynamic-links'
   implementation project(':app:app_resources')

diff --git a/app/src/util_android.cc b/app/src/util_android.cc
@@ -1587,12 +1587,33 @@ const std::vector<internal::EmbeddedFile>& CacheEmbeddedFiles(
         file::GetClass(), file::GetMethodId(file::kConstructorFilePath),
         cache_dir, filename);
     env->DeleteLocalRef(filename);
+    CheckAndClearJniExceptions(env);
+    // Below, we would have set the file read only on a previous run. Here, set
+    // it to writable and then delete it before creating it again.
+    //
+    // if output_file.exists() {
+    if (env->CallBooleanMethod(output_file, file::GetMethodId(file::kExists))) {
+      CheckAndClearJniExceptions(env);
+      // output_file.setWritable(true);
+      env->CallBooleanMethod(output_file, file::GetMethodId(file::kSetWritable),
+                             JNI_TRUE);
+      CheckAndClearJniExceptions(env);
+      // output_file.delete();
+      env->CallBooleanMethod(output_file, file::GetMethodId(file::kDelete));
+      CheckAndClearJniExceptions(env);
+    }
     jobject output_stream = env->NewObject(
         file_output_stream::GetClass(),
         file_output_stream::GetMethodId(file_output_stream::kConstructorFile),
         output_file);
     bool failed = CheckAndClearJniExceptions(env);
     if (!failed) {
+      // Android 14 requires that we set the open dex file to readonly BEFORE
+      // writing code to it.
+      jboolean did_set_readonly = env->CallBooleanMethod(
+          output_file, file::GetMethodId(file::kSetReadOnly));
+      // If it failed, move on and try again later after closing the file.
+      if (CheckAndClearJniExceptions(env)) did_set_readonly = JNI_FALSE;
       jobject output_array = env->NewByteArray(it->size);
       env->SetByteArrayRegion(static_cast<jbyteArray>(output_array), 0,
                               it->size,
@@ -1605,6 +1626,11 @@ const std::vector<internal::EmbeddedFile>& CacheEmbeddedFiles(
       env->CallVoidMethod(output_stream, file_output_stream::GetMethodId(
                                              file_output_stream::kClose));
       failed |= CheckAndClearJniExceptions(env);
+      if (!did_set_readonly) {
+        env->CallBooleanMethod(output_file,
+                               file::GetMethodId(file::kSetReadOnly));
+        util::CheckAndClearJniExceptions(env);
+      }
       env->DeleteLocalRef(output_array);
       env->DeleteLocalRef(output_stream);
     }

diff --git a/app/src/util_android.h b/app/src/util_android.h
@@ -568,6 +568,10 @@ METHOD_LOOKUP_DECLARATION(intent, INTENT_METHODS);
   X(ConstructorFilePath, "<init>", "(Ljava/io/File;Ljava/lang/String;)V"), \
   X(GetAbsolutePath, "getAbsolutePath", "()Ljava/lang/String;"),           \
   X(GetPath, "getPath", "()Ljava/lang/String;"),                           \
+  X(Exists, "exists", "()Z"),                                              \
+  X(Delete, "delete", "()Z"),                                              \
+  X(SetReadOnly, "setReadOnly", "()Z"),                                    \
+  X(SetWritable, "setWritable", "(Z)Z"),                                   \
   X(ToUri, "toURI", "()Ljava/net/URI;")
 // clang-format on
 METHOD_LOOKUP_DECLARATION(file, FILE_METHODS)

diff --git a/app_check/app_check_resources/build.gradle b/app_check/app_check_resources/build.gradle
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.2.3')
+  implementation platform('com.google.firebase:firebase-bom:32.3.1')
   implementation 'com.google.firebase:firebase-appcheck'
 }
 

diff --git a/app_check/integration_test/Podfile b/app_check/integration_test/Podfile
@@ -4,20 +4,20 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '11.0'
-  pod 'Firebase/AppCheck', '10.14.0'
-  pod 'Firebase/Database', '10.14.0'
-  pod 'Firebase/Auth', '10.14.0'
-  pod 'Firebase/Storage', '10.14.0'
-  pod 'Firebase/Functions', '10.14.0'
+  pod 'Firebase/AppCheck', '10.15.0'
+  pod 'Firebase/Database', '10.15.0'
+  pod 'Firebase/Auth', '10.15.0'
+  pod 'Firebase/Storage', '10.15.0'
+  pod 'Firebase/Functions', '10.15.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/AppCheck', '10.14.0'
-  pod 'Firebase/Database', '10.14.0'
-  pod 'Firebase/Auth', '10.14.0'
-  pod 'Firebase/Storage', '10.14.0'
-  pod 'Firebase/Functions', '10.14.0'
+  pod 'Firebase/AppCheck', '10.15.0'
+  pod 'Firebase/Database', '10.15.0'
+  pod 'Firebase/Auth', '10.15.0'
+  pod 'Firebase/Storage', '10.15.0'
+  pod 'Firebase/Functions', '10.15.0'
 end
 
 post_install do |installer|

diff --git a/auth/auth_resources/build.gradle b/auth/auth_resources/build.gradle
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.2.3')
+  implementation platform('com.google.firebase:firebase-bom:32.3.1')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-auth'
   implementation project(':app:app_resources')

diff --git a/auth/integration_test/Podfile b/auth/integration_test/Podfile
@@ -4,12 +4,12 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '11.0'
-  pod 'Firebase/Auth', '10.14.0'
+  pod 'Firebase/Auth', '10.15.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Auth', '10.14.0'
+  pod 'Firebase/Auth', '10.15.0'
 end
 
 post_install do |installer|

diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake
@@ -20,7 +20,7 @@ endif()
 
 # If the format of the line below changes, then be sure to update
 # https://github.com/firebase/firebase-cpp-sdk/blob/fd054fa016/.github/workflows/update-dependencies.yml#L81
-set(version CocoaPods-10.14.0)
+set(version CocoaPods-10.15.0)
 
 function(GetReleasedDep)
   message("Getting released firebase-ios-sdk @ ${version}")

diff --git a/cpp_sdk_version.json b/cpp_sdk_version.json
@@ -1,5 +1,5 @@
 {
-  "released": "11.4.0",
-  "stable": "11.4.0",
-  "head": "11.4.0"
+  "released": "11.5.0",
+  "stable": "11.5.0",
+  "head": "11.5.0"
 }
diff --git a/database/database_resources/build.gradle b/database/database_resources/build.gradle
@@ -45,7 +45,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.2.3')
+  implementation platform('com.google.firebase:firebase-bom:32.3.1')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-database'
   //implementation project(':app:app_resources')

diff --git a/database/integration_test/Podfile b/database/integration_test/Podfile
@@ -4,14 +4,14 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '11.0'
-  pod 'Firebase/Database', '10.14.0'
-  pod 'Firebase/Auth', '10.14.0'
+  pod 'Firebase/Database', '10.15.0'
+  pod 'Firebase/Auth', '10.15.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Database', '10.14.0'
-  pod 'Firebase/Auth', '10.14.0'
+  pod 'Firebase/Database', '10.15.0'
+  pod 'Firebase/Auth', '10.15.0'
 end
 
 post_install do |installer|

diff --git a/dynamic_links/integration_test/Podfile b/dynamic_links/integration_test/Podfile
@@ -4,7 +4,7 @@ platform :ios, '11.0'
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  pod 'Firebase/DynamicLinks', '10.14.0'
+  pod 'Firebase/DynamicLinks', '10.15.0'
 end
 
 post_install do |installer|

diff --git a/firestore/firestore_resources/build.gradle b/firestore/firestore_resources/build.gradle
@@ -53,7 +53,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.2.3')
+  implementation platform('com.google.firebase:firebase-bom:32.3.1')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.firebase:firebase-firestore'
 }

diff --git a/firestore/integration_test/Podfile b/firestore/integration_test/Podfile
@@ -4,14 +4,14 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '11.0'
-  pod 'Firebase/Firestore', '10.14.0'
-  pod 'Firebase/Auth', '10.14.0'
+  pod 'Firebase/Firestore', '10.15.0'
+  pod 'Firebase/Auth', '10.15.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Firestore', '10.14.0'
-  pod 'Firebase/Auth', '10.14.0'
+  pod 'Firebase/Firestore', '10.15.0'
+  pod 'Firebase/Auth', '10.15.0'
 end
 
 post_install do |installer|

diff --git a/firestore/integration_test_internal/Podfile b/firestore/integration_test_internal/Podfile
@@ -4,14 +4,14 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '11.0'
-  pod 'Firebase/Firestore', '10.14.0'
-  pod 'Firebase/Auth', '10.14.0'
+  pod 'Firebase/Firestore', '10.15.0'
+  pod 'Firebase/Auth', '10.15.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Firestore', '10.14.0'
-  pod 'Firebase/Auth', '10.14.0'
+  pod 'Firebase/Firestore', '10.15.0'
+  pod 'Firebase/Auth', '10.15.0'
 end
 
 post_install do |installer|

diff --git a/functions/integration_test/Podfile b/functions/integration_test/Podfile
@@ -4,14 +4,14 @@ use_frameworks! :linkage => :static
 
 target 'integration_test' do
   platform :ios, '11.0'
-  pod 'Firebase/Functions', '10.14.0'
-  pod 'Firebase/Auth', '10.14.0'
+  pod 'Firebase/Functions', '10.15.0'
+  pod 'Firebase/Auth', '10.15.0'
 end
 
 target 'integration_test_tvos' do
   platform :tvos, '12.0'
-  pod 'Firebase/Functions', '10.14.0'
-  pod 'Firebase/Auth', '10.14.0'
+  pod 'Firebase/Functions', '10.15.0'
+  pod 'Firebase/Auth', '10.15.0'
 end
 
 post_install do |installer|

diff --git a/gma/gma_resources/build.gradle b/gma/gma_resources/build.gradle
@@ -50,7 +50,7 @@ android {
 }
 
 dependencies {
-  implementation platform('com.google.firebase:firebase-bom:32.2.3')
+  implementation platform('com.google.firebase:firebase-bom:32.3.1')
   implementation 'com.google.firebase:firebase-analytics'
   implementation 'com.google.android.gms:play-services-ads:22.3.0'
   implementation 'com.google.android.ump:user-messaging-platform:2.1.0'

diff --git a/gma/integration_test/Podfile b/gma/integration_test/Podfile
@@ -4,8 +4,8 @@ platform :ios, '11.0'
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  pod 'Firebase/CoreOnly', '10.14.0'
-  pod 'Google-Mobile-Ads-SDK', '10.9.0'
+  pod 'Firebase/CoreOnly', '10.15.0'
+  pod 'Google-Mobile-Ads-SDK', '10.10.0'
   pod 'GoogleUserMessagingPlatform', '2.1.0'
 end
 

diff --git a/installations/integration_test/Podfile b/installations/integration_test/Podfile
@@ -4,8 +4,8 @@ platform :ios, '11.0'
 use_frameworks! :linkage => :static
 
 target 'integration_test' do
-  pod 'Firebase/Analytics', '10.14.0'
-  pod 'Firebase/Installations', '10.14.0'
+  pod 'Firebase/Analytics', '10.15.0'
+  pod 'Firebase/Installations', '10.15.0'
 end
 
 post_install do |installer|