From 431d65453de270bec9bf1528bc9ff225b45f0a8e Mon Sep 17 00:00:00 2001 From: rosariopf Date: Tue, 28 Mar 2023 18:23:33 +0100 Subject: [PATCH 1/2] use a pre-built aar for firebase-auth-ktx --- auth/app/build.gradle | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/auth/app/build.gradle b/auth/app/build.gradle index e20c5f5b8..02fb2f299 100644 --- a/auth/app/build.gradle +++ b/auth/app/build.gradle @@ -53,11 +53,9 @@ dependencies { // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) implementation platform('com.google.firebase:firebase-bom:31.3.0') - // Firebase Authentication (Java) - implementation 'com.google.firebase:firebase-auth' - // Firebase Authentication (Kotlin) - implementation 'com.google.firebase:firebase-auth-ktx' + implementation files('../libs/firebase-auth-ktx-21.2.0.aar') + implementation 'com.google.firebase:firebase-common-ktx' // Google Identity Services SDK (only required for Auth with Google) implementation 'com.google.android.gms:play-services-auth:20.4.1' From 50e7397bdac9859f569a4e3099aea71968b72a5d Mon Sep 17 00:00:00 2001 From: rosariopf Date: Tue, 28 Mar 2023 18:43:10 +0100 Subject: [PATCH 2/2] remove BoM import and add transitive deps --- auth/app/build.gradle | 17 +++++++++++------ auth/gradle.properties | 1 + 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/auth/app/build.gradle b/auth/app/build.gradle index 02fb2f299..1c165b2b9 100644 --- a/auth/app/build.gradle +++ b/auth/app/build.gradle @@ -50,19 +50,24 @@ dependencies { implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3' implementation 'androidx.navigation:navigation-ui-ktx:2.5.3' - // Import the Firebase BoM (see: https://firebase.google.com/docs/android/learn-more#bom) - implementation platform('com.google.firebase:firebase-bom:31.3.0') - - // Firebase Authentication (Kotlin) + // Firebase Authentication + implementation files('../libs/firebase-auth-21.2.0.aar') implementation files('../libs/firebase-auth-ktx-21.2.0.aar') - implementation 'com.google.firebase:firebase-common-ktx' + + // Firebase Auth's transitive dependencies + implementation 'com.google.firebase:firebase-auth-interop:20.0.0' + implementation 'com.google.firebase:firebase-common-ktx:20.3.2' + implementation 'com.google.android.recaptcha:recaptcha:18.1.1' // Google Identity Services SDK (only required for Auth with Google) implementation 'com.google.android.gms:play-services-auth:20.4.1' // Firebase UI // Used in FirebaseUIActivity. - implementation 'com.firebaseui:firebase-ui-auth:8.0.2' + implementation ('com.firebaseui:firebase-ui-auth:8.0.2') { + // Excluding auth so that it doesn't pick up an older version + exclude group: 'com.google.firebase', module: 'firebase-auth' + } // Facebook Android SDK (only required for Facebook Login) // Used in FacebookLoginActivity. diff --git a/auth/gradle.properties b/auth/gradle.properties index aac7c9b46..c79c84715 100644 --- a/auth/gradle.properties +++ b/auth/gradle.properties @@ -15,3 +15,4 @@ org.gradle.jvmargs=-Xmx1536m # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true +android.useAndroidX=true \ No newline at end of file