release: internal release candidate (2025-10-02)

.firebase/hosting.cHVibGlj.cache

@@ -0,0 +1,2 @@
+index.html,1760725054923,96d3ff69603ba92f085431c7b56242a873ddcdd5a1c9691f7836b093f8114a5a
+.well-known/assetlinks.json,1760725039101,cbfe2437a47d2f4a2bca9bb7c1c789b4684d6a13694821e46e4177ccce023f4b

.github/workflows/android.yml

@@ -7,14 +7,27 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    timeout-minutes: 45
     steps:
-      - uses: actions/checkout@v2
-      - name: set up JDK 17
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+
+      - name: Cache Gradle packages
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          java-version: 17
-      - name: Build with Gradle
+          java-version: '21'
+          distribution: 'temurin'
+
+      - name: Build and Test
         run: ./scripts/build.sh
+
       - name: Print Logs
         if: failure()
         run: ./scripts/print_build_logs.sh

.github/workflows/e2e_test.yml

@@ -0,0 +1,52 @@
+name: E2E Tests (Firebase Emulator)
+
+on:
+  - pull_request
+  - push
+
+jobs:
+  e2e-tests:
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Cache Gradle packages
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+
+      - name: Firebase Emulator Cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/firebase/emulators
+          key: firebase-emulators-v3-${{ runner.os }}
+
+      - name: Install Node.js 20
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      - name: Install Firebase Tools
+        run: |
+          npm i -g firebase-tools
+
+      - name: Start Firebase Auth Emulator
+        run: ./scripts/start-firebase-emulator.sh
+
+      - name: Run E2E Tests
+        run: |
+          ./gradlew e2eTest
+
+      - name: Print Logs
+        if: failure()
+        run: ./scripts/print_build_logs.sh

.gitignore

@@ -11,3 +11,5 @@ google-services.json
 crashlytics-build.properties
 auth/src/main/res/values/com_crashlytics_export_strings.xml
 *.log
+composeapp/.firebaserc
+composeapp/firebase.json

auth/build.gradle.kts

@@ -1,9 +1,8 @@
-import com.android.build.gradle.internal.dsl.TestOptions
-
 plugins {
     id("com.android.library")
     id("com.vanniktech.maven.publish")
     id("org.jetbrains.kotlin.android")
+    id("org.jetbrains.kotlin.plugin.compose") version Config.kotlinVersion
 }
 
 android {
@@ -12,8 +11,9 @@ android {
 
     defaultConfig {
         minSdk = Config.SdkVersions.min
-        targetSdk =Config.SdkVersions.target
+        targetSdk = Config.SdkVersions.target
 
+        buildConfigField("String", "LIBRARY_NAME", "\"Firebase-UI-Android\"")
         buildConfigField("String", "VERSION_NAME", "\"${Config.version}\"")
 
         resourcePrefix("fui_")
@@ -26,8 +26,8 @@ android {
             consumerProguardFiles("auth-proguard.pro")
         }
     }
-        
-    compileOptions {    
+
+    compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
@@ -67,41 +67,80 @@ android {
     kotlinOptions {
         jvmTarget = "17"
     }
+    buildFeatures {
+        compose = true
+        buildConfig = true
+    }
 }
 
 dependencies {
-    implementation(Config.Libs.Androidx.materialDesign)
+    implementation(platform(Config.Libs.Androidx.Compose.bom))
+    implementation(Config.Libs.Androidx.Compose.ui)
+    implementation(Config.Libs.Androidx.Compose.uiGraphics)
+    implementation(Config.Libs.Androidx.Compose.material3)
+    implementation(Config.Libs.Androidx.Compose.foundation)
+    implementation(Config.Libs.Androidx.Compose.tooling)
+    implementation(Config.Libs.Androidx.Compose.toolingPreview)
+    implementation(Config.Libs.Androidx.Compose.activityCompose)
     implementation(Config.Libs.Androidx.activity)
+    implementation(Config.Libs.Androidx.materialDesign)
+    implementation(Config.Libs.Androidx.Compose.materialIconsExtended)
+    implementation(Config.Libs.Androidx.datastorePreferences)
     // The new activity result APIs force us to include Fragment 1.3.0
     // See https://issuetracker.google.com/issues/152554847
     implementation(Config.Libs.Androidx.fragment)
     implementation(Config.Libs.Androidx.customTabs)
     implementation(Config.Libs.Androidx.constraint)
-    implementation("androidx.credentials:credentials:1.3.0")
-    implementation("androidx.credentials:credentials-play-services-auth:1.3.0")
+
+    // Google Authentication
+    implementation(Config.Libs.Androidx.credentials)
+    implementation(Config.Libs.Androidx.credentialsPlayServices)
+    implementation(Config.Libs.Misc.googleid)
+    implementation(Config.Libs.PlayServices.auth)
+    //api(Config.Libs.PlayServices.auth)
 
     implementation(Config.Libs.Androidx.lifecycleExtensions)
     implementation("androidx.core:core-ktx:1.13.1")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
-    implementation("com.google.android.libraries.identity.googleid:googleid:1.1.1")
+    implementation("androidx.navigation:navigation-compose:2.8.3")
+    implementation("com.google.zxing:core:3.5.3")
     annotationProcessor(Config.Libs.Androidx.lifecycleCompiler)
 
     implementation(platform(Config.Libs.Firebase.bom))
     api(Config.Libs.Firebase.auth)
-    api(Config.Libs.PlayServices.auth)
+
+    // Phone number validation
+    implementation(Config.Libs.Misc.libphonenumber)
 
     compileOnly(Config.Libs.Provider.facebook)
     implementation(Config.Libs.Androidx.legacySupportv4) // Needed to override deps
     implementation(Config.Libs.Androidx.cardView) // Needed to override Facebook
 
     testImplementation(Config.Libs.Test.junit)
     testImplementation(Config.Libs.Test.truth)
-    testImplementation(Config.Libs.Test.mockito)
     testImplementation(Config.Libs.Test.core)
     testImplementation(Config.Libs.Test.robolectric)
+    testImplementation(Config.Libs.Test.kotlinReflect)
     testImplementation(Config.Libs.Provider.facebook)
+    testImplementation(Config.Libs.Test.mockitoCore)
+    testImplementation(Config.Libs.Test.mockitoInline)
+    testImplementation(Config.Libs.Test.mockitoKotlin)
+    testImplementation(Config.Libs.Androidx.credentials)
+    testImplementation(Config.Libs.Test.composeUiTestJunit4)
 
     debugImplementation(project(":internal:lintchecks"))
 }
+
+val mockitoAgent by configurations.creating
+
+dependencies {
+    mockitoAgent(Config.Libs.Test.mockitoCore) {
+        isTransitive = false
+    }
+}
+
+tasks.withType<Test>().configureEach {
+    jvmArgs("-javaagent:${mockitoAgent.asPath}")
+}

auth/src/main/AndroidManifest.xml

@@ -19,6 +19,12 @@
 
     <application>
 
+        <service android:name="com.google.firebase.components.ComponentDiscoveryService">
+            <meta-data
+                android:name="com.google.firebase.components:com.firebase.ui.auth.compose.FirebaseUIComposeRegistrar"
+                android:value="com.google.firebase.components.ComponentRegistrar" />
+        </service>
+
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
@@ -27,6 +33,10 @@
             android:name="com.facebook.sdk.ApplicationId"
             android:value="@string/facebook_application_id" />
 
+        <meta-data
+            android:name="com.facebook.sdk.ClientToken"
+            android:value="@string/facebook_client_token"/>
+
         <activity
             android:name=".KickoffActivity"
             android:label=""
@@ -83,8 +93,8 @@
 
         <activity
             android:name=".ui.email.EmailLinkCatcherActivity"
-            android:exported="false"
             android:label=""
+            android:exported="false"
             android:theme="@style/FirebaseUI.Transparent"
             android:windowSoftInputMode="adjustResize" />