fix: bump FlutterFire dependencies & fix CI (#552)

russellwheatley · web-flow · commit 0e6d85bf4c31 · 2025-09-30T15:27:54.000+01:00
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -70,6 +70,9 @@ jobs:
           melos-version: "3.0.1"
       - name: "Bootstrap package"
         run: melos bootstrap --scope tests
+        # needed because twitter_login plugin doesn't have a namespace defined and he hasn't released a new version yet: https://github.com/0maru/twitter_login/issues/139
+      - name: Patch twitter_login plugin
+        run: ./scripts/patch-twitter-login.sh
       - name: Start Firebase Emulator
         run: |
           cd functions/
diff --git a/packages/firebase_ui_auth/example/pubspec.yaml b/packages/firebase_ui_auth/example/pubspec.yaml
@@ -22,8 +22,8 @@ environment:
 
 dependencies:
   cupertino_icons: ^1.0.6
-  firebase_auth: ^6.0.0
-  firebase_core: ^4.0.0
+  firebase_auth: ^6.1.0
+  firebase_core: ^4.1.1
   flutter:
     sdk: flutter
   flutter_localizations:
diff --git a/packages/firebase_ui_auth/pubspec.yaml b/packages/firebase_ui_auth/pubspec.yaml
@@ -11,8 +11,8 @@ environment:
 dependencies:
   app_links: ^6.4.0
   email_validator: ^2.1.17
-  firebase_auth: ^6.0.0
-  firebase_core: ^4.0.0
+  firebase_auth: ^6.1.0
+  firebase_core: ^4.1.1
   firebase_ui_localizations: ^2.0.0
   firebase_ui_oauth: ^2.0.0
   firebase_ui_shared: ^1.4.1
diff --git a/packages/firebase_ui_database/example/pubspec.yaml b/packages/firebase_ui_database/example/pubspec.yaml
@@ -33,8 +33,8 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.6
-  firebase_core: ^4.0.0
-  firebase_database: ^12.0.0
+  firebase_core: ^4.1.1
+  firebase_database: ^12.0.2
 dev_dependencies:
   drive: ^1.0.0-1.0.nullsafety.5
   flutter_test:
diff --git a/packages/firebase_ui_database/pubspec.yaml b/packages/firebase_ui_database/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
 
 dependencies:
   collection: ^1.18.0
-  firebase_database: ^12.0.0
+  firebase_database: ^12.0.2
   firebase_ui_localizations: ^2.0.0
   flutter:
     sdk: flutter
diff --git a/packages/firebase_ui_firestore/example/pubspec.yaml b/packages/firebase_ui_firestore/example/pubspec.yaml
@@ -30,9 +30,9 @@ dependencies:
   flutter:
     sdk: flutter
   firebase_ui_firestore: ^2.0.0
-  cloud_firestore: ^6.0.0
+  cloud_firestore: ^6.0.2
   cupertino_icons: ^1.0.6
-  firebase_core: ^4.0.0
+  firebase_core: ^4.1.1
 dev_dependencies:
   drive: ^1.0.0-1.0.nullsafety.5
   flutter_test:
diff --git a/packages/firebase_ui_firestore/pubspec.yaml b/packages/firebase_ui_firestore/pubspec.yaml
@@ -8,7 +8,7 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  cloud_firestore: ^6.0.0
+  cloud_firestore: ^6.0.2
   firebase_ui_localizations: ^2.0.0
   firebase_ui_shared: ^1.4.1
   flutter:
diff --git a/packages/firebase_ui_localizations/example/pubspec.yaml b/packages/firebase_ui_localizations/example/pubspec.yaml
@@ -31,7 +31,7 @@ environment:
 dependencies:
   cupertino_icons: ^1.0.6
 
-  firebase_core: ^4.0.0
+  firebase_core: ^4.1.1
   firebase_ui_auth: ^3.0.0
   firebase_ui_localizations: ^2.0.0
   flutter:
diff --git a/packages/firebase_ui_oauth/example/pubspec.yaml b/packages/firebase_ui_oauth/example/pubspec.yaml
@@ -33,8 +33,8 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.6
-  firebase_auth: ^6.0.0
-  firebase_core: ^4.0.0
+  firebase_auth: ^6.1.0
+  firebase_core: ^4.1.1
   firebase_ui_oauth: ^2.0.0
   firebase_ui_oauth_apple: ^2.0.0
   firebase_ui_oauth_facebook: ^2.0.0
diff --git a/packages/firebase_ui_oauth/pubspec.yaml b/packages/firebase_ui_oauth/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
 
 dependencies:
   desktop_webview_auth: ^0.0.14
-  firebase_auth: ^6.0.0
+  firebase_auth: ^6.1.0
   firebase_ui_auth: ^3.0.0
   firebase_ui_shared: ^1.4.1
   flutter_svg: ^2.0.9
diff --git a/packages/firebase_ui_oauth_apple/pubspec.yaml b/packages/firebase_ui_oauth_apple/pubspec.yaml
@@ -8,7 +8,7 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  firebase_auth: ^6.0.0
+  firebase_auth: ^6.1.0
   firebase_ui_oauth: ^2.0.0
   flutter:
     sdk: flutter
diff --git a/packages/firebase_ui_oauth_facebook/pubspec.yaml b/packages/firebase_ui_oauth_facebook/pubspec.yaml
@@ -8,7 +8,7 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  firebase_auth: ^6.0.0
+  firebase_auth: ^6.1.0
   firebase_ui_oauth: ^2.0.0
   flutter:
     sdk: flutter
diff --git a/packages/firebase_ui_oauth_google/pubspec.yaml b/packages/firebase_ui_oauth_google/pubspec.yaml
@@ -8,7 +8,7 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  firebase_auth: ^6.0.0
+  firebase_auth: ^6.1.0
   firebase_ui_oauth: ^2.0.0
   flutter:
     sdk: flutter
diff --git a/packages/firebase_ui_oauth_twitter/pubspec.yaml b/packages/firebase_ui_oauth_twitter/pubspec.yaml
@@ -10,7 +10,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  firebase_auth: ^6.0.0
+  firebase_auth: ^6.1.0
   firebase_ui_oauth: ^2.0.0
   twitter_login: ^4.4.2
 
diff --git a/packages/firebase_ui_storage/example/pubspec.yaml b/packages/firebase_ui_storage/example/pubspec.yaml
@@ -9,8 +9,8 @@ environment:
 dependencies:
   cupertino_icons: ^1.0.6
   file_picker: ^6.1.1
-  firebase_core: ^4.0.0
-  firebase_storage: ^13.0.0
+  firebase_core: ^4.1.1
+  firebase_storage: ^13.0.2
   firebase_ui_storage: ^3.0.0
   firebase_ui_shared: ^1.4.1
 
diff --git a/packages/firebase_ui_storage/pubspec.yaml b/packages/firebase_ui_storage/pubspec.yaml
@@ -13,7 +13,7 @@ false_secrets:
 dependencies:
   flutter:
     sdk: flutter
-  firebase_storage: ^13.0.0
+  firebase_storage: ^13.0.2
   firebase_ui_localizations: ^2.0.0
   firebase_ui_shared: ^1.4.1
   path: ^1.8.3
diff --git a/scripts/patch-twitter-login.sh b/scripts/patch-twitter-login.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+set -e
+
+# Script to patch twitter_login plugin to add namespace for AGP 8.x compatibility
+# This is required because twitter_login 4.4.2 doesn't have a namespace defined
+
+echo "Patching twitter_login plugin for AGP 8.x compatibility..."
+
+# Determine pub cache directory (supports both local and CI environments)
+if [ -n "$PUB_CACHE" ]; then
+  PUB_CACHE_DIR="$PUB_CACHE"
+elif [ -n "$FLUTTER_ROOT" ]; then
+  PUB_CACHE_DIR="$FLUTTER_ROOT/.pub-cache"
+else
+  PUB_CACHE_DIR="$HOME/.pub-cache"
+fi
+
+echo "Using pub cache directory: $PUB_CACHE_DIR"
+
+# Find the twitter_login plugin build.gradle file (not the example one)
+TWITTER_LOGIN_BUILD_GRADLE=$(find "$PUB_CACHE_DIR/hosted" -name "build.gradle" -path "*/twitter_login-*/android/build.gradle" ! -path "*/example/*" 2>/dev/null | head -n 1)
+
+if [ -z "$TWITTER_LOGIN_BUILD_GRADLE" ]; then
+  echo "Error: Could not find twitter_login build.gradle file"
+  echo "Searched in: $PUB_CACHE_DIR/hosted"
+  echo "Available twitter_login directories:"
+  find "$PUB_CACHE_DIR/hosted" -type d -name "twitter_login-*" 2>/dev/null || echo "None found"
+  exit 1
+fi
+
+echo "Found twitter_login build.gradle at: $TWITTER_LOGIN_BUILD_GRADLE"
+
+# Check if namespace is already present
+if grep -q "namespace" "$TWITTER_LOGIN_BUILD_GRADLE"; then
+  echo "Namespace already present in twitter_login build.gradle, skipping patch"
+  exit 0
+fi
+
+# Add namespace to android block
+# Use different sed syntax for macOS vs Linux
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  # macOS
+  sed -i.bak '/^android {$/a\
+    namespace '\''com.maru.twitter_login'\''
+' "$TWITTER_LOGIN_BUILD_GRADLE"
+else
+  # Linux
+  sed -i '/^android {$/a\    namespace '\''com.maru.twitter_login'\''' "$TWITTER_LOGIN_BUILD_GRADLE"
+fi
+
+echo "Successfully patched twitter_login build.gradle with namespace"
diff --git a/tests/android/app/build.gradle b/tests/android/app/build.gradle
@@ -9,24 +9,24 @@ plugins {
 android {
     namespace = "io.flutter.plugins.firebase.tests"
     // use "flutter.compileSdkVersion" and bump AGP once twitter_login has released v4.4.3: https://github.com/0maru/twitter_login/issues/139
-    compileSdkVersion 34
+    compileSdk 36
     ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = JavaVersion.VERSION_11
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId = "io.flutter.plugins.firebase.tests"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
-        minSdk = 23
+        minSdkVersion = flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName
@@ -43,4 +43,4 @@ android {
 
 flutter {
     source = "../.."
-}
+}
diff --git a/tests/android/gradle.properties b/tests/android/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4G
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=false
diff --git a/tests/android/gradle/wrapper/gradle-wrapper.properties b/tests/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
diff --git a/tests/android/settings.gradle b/tests/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+    id "com.android.application" version "8.7.3" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
     id "com.google.gms.google-services" version "4.4.2" apply false
 }
 
diff --git a/tests/ios/Podfile b/tests/ios/Podfile
@@ -29,7 +29,7 @@ flutter_ios_podfile_setup
 target 'Runner' do
   use_frameworks!
   use_modular_headers!
-  pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '12.0.0'
+  pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '12.2.0'
 
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
   target 'RunnerTests' do
diff --git a/tests/macos/Podfile b/tests/macos/Podfile
@@ -30,7 +30,7 @@ target 'Runner' do
   use_frameworks!
   use_modular_headers!
 
-  pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '12.0.0'
+  pod 'FirebaseFirestore', :git => 'https://github.com/invertase/firestore-ios-sdk-frameworks.git', :tag => '12.2.0'
 
   flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
   target 'RunnerTests' do
diff --git a/tests/pubspec.yaml b/tests/pubspec.yaml
@@ -10,8 +10,8 @@ dependencies:
   flutter:
     sdk: flutter
   cupertino_icons: ^1.0.6
-  firebase_auth: ^6.0.0
-  firebase_core: ^4.0.0
+  firebase_auth: ^6.1.0
+  firebase_core: ^4.1.1
   firebase_ui_auth: ^3.0.0
   firebase_ui_localizations: ^2.0.0
   firebase_ui_oauth_apple: ^2.0.0
@@ -21,12 +21,12 @@ dependencies:
   flutter_facebook_auth: ^6.0.3
   twitter_login: ^4.4.2
   firebase_ui_oauth_twitter: ^2.0.0
-  cloud_firestore: ^6.0.0
+  cloud_firestore: ^6.0.2
   firebase_ui_firestore: ^2.0.0
   http: ^1.1.2
   google_sign_in: ^6.2.1
   firebase_ui_shared: ^1.4.1
-  firebase_database: ^12.0.0
+  firebase_database: ^12.0.2
   firebase_ui_database: ^2.0.0
 
 dev_dependencies:
