diff --git a/UIViews/build.gradle.kts b/UIViews/build.gradle.kts index d6512ee5c..364bb1118 100644 --- a/UIViews/build.gradle.kts +++ b/UIViews/build.gradle.kts @@ -34,6 +34,7 @@ dependencies { androidTestImplementation(TestDeps.androidJunit) androidTestImplementation(TestDeps.androidEspresso) + implementation(platform(libs.firebasePlatform)) implementation(libs.firebaseAuth) implementation(libs.playServices) diff --git a/animeworld/build.gradle.kts b/animeworld/build.gradle.kts index 6c32deb62..8a65d6d90 100644 --- a/animeworld/build.gradle.kts +++ b/animeworld/build.gradle.kts @@ -23,6 +23,7 @@ dependencies { implementation(libs.material) implementation(androidx.constraintlayout.constraintlayout) implementation(androidx.preference.preferenceKtx) + implementation(platform(libs.firebasePlatform)) implementation(libs.bundles.firebaseCrashLibs) implementation(androidx.recyclerview.recyclerview) testImplementation(TestDeps.junit) diff --git a/animeworldtv/build.gradle.kts b/animeworldtv/build.gradle.kts index 5622ba2be..08c3b8503 100644 --- a/animeworldtv/build.gradle.kts +++ b/animeworldtv/build.gradle.kts @@ -22,6 +22,7 @@ dependencies { implementation(libs.androidxLegacySupport) implementation(libs.material) implementation(libs.constraintlayout) + implementation(platform(libs.firebasePlatform)) implementation(libs.bundles.firebaseCrashLibs) implementation(libs.firebaseAuth) implementation(libs.playServices) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ef63b3ea6..f8b0a6524 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -42,6 +42,7 @@ compose3CommonVersion = "1.0.0-alpha01" compose3AdaptiveVersion = "1.1.0-alpha02" composeBomVersion = "2024.09.00-alpha" materialKolor = "1.7.0" +firebaseKtx = "0.2.0" ### MangaWorld piasy = "1.8.1" @@ -193,8 +194,6 @@ iconicsCore = "com.mikepenz:iconics-core:5.5.0-compose01" androidxLegacySupport = "androidx.legacy:legacy-support-v4:1.0.0" -firebaseAuth = "com.google.firebase:firebase-auth:22.3.1" - pagingCompose = { module = "androidx.paging:paging-compose", version.ref = "pagingVersion" } fileChooser = "com.github.hedzr:android-file-chooser:1.2.0" @@ -214,10 +213,6 @@ datastorePref = "androidx.datastore:datastore-preferences:1.1.1" jsoup = "org.jsoup:jsoup:1.18.1" -crashlytics = "com.google.firebase:firebase-crashlytics:18.6.4" -analytics = "com.google.firebase:firebase-analytics:21.6.2" -playServices = "com.google.android.gms:play-services-auth:21.2.0" - preference = "androidx.preference:preference-ktx:1.2.1" recyclerview = "androidx.recyclerview:recyclerview:1.3.2" @@ -302,10 +297,16 @@ androidxWebkit = "androidx.webkit:webkit:1.11.0" mlkitTranslate = "com.google.mlkit:translate:17.0.3" mlkitLanguage = "com.google.mlkit:language-id:17.0.6" -firebasePlatform = "com.google.firebase:firebase-bom:33.2.0" +firebasePlatform = "com.google.firebase:firebase-bom:33.3.0" firebaseDatabase = { group = "com.google.firebase", name = "firebase-database" } firebaseFirestore = { group = "com.google.firebase", name = "firebase-firestore" } +firebaseAuth = { group = "com.google.firebase", name = "firebase-auth" } +crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics" } +analytics = { group = "com.google.firebase", name = "firebase-analytics" } firebaseUiAuth = "com.firebaseui:firebase-ui-auth:8.0.2" +playServices = "com.google.android.gms:play-services-auth:21.2.0" + +firebase-database-ktx = { module = "com.github.skydoves:firebase-database-ktx", version.ref = "firebaseKtx" } protobufJava = { module = "com.google.protobuf:protobuf-javalite", version.ref = "protobufVersion" } protobufKotlin = { module = "com.google.protobuf:protobuf-kotlin-lite", version.ref = "protobufVersion" } diff --git a/mangaworld/build.gradle.kts b/mangaworld/build.gradle.kts index 86aef3480..8d73b8247 100644 --- a/mangaworld/build.gradle.kts +++ b/mangaworld/build.gradle.kts @@ -31,6 +31,7 @@ dependencies { testImplementation(TestDeps.junit) androidTestImplementation(TestDeps.androidJunit) androidTestImplementation(TestDeps.androidEspresso) + implementation(platform(libs.firebasePlatform)) implementation(libs.bundles.firebaseCrashLibs) implementation(libs.fileChooser) diff --git a/novelworld/build.gradle.kts b/novelworld/build.gradle.kts index ce3df1f69..88a308aa3 100644 --- a/novelworld/build.gradle.kts +++ b/novelworld/build.gradle.kts @@ -38,6 +38,7 @@ dependencies { implementation(libs.bundles.roomLibs) ksp(libs.roomCompiler) + implementation(platform(libs.firebasePlatform)) implementation(libs.bundles.firebaseCrashLibs) val composeBom = platform(libs.composePlatform) implementation(composeBom) diff --git a/settings.gradle.kts b/settings.gradle.kts index 479f3d40d..b0d800597 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -22,13 +22,13 @@ dependencyResolutionManagement { //TODO: Remove current ones and replace with this! versionCatalogs { create("androidx") { - from("androidx.gradle:gradle-version-catalog:2024.08.01") + from("androidx.gradle:gradle-version-catalog:2024.09.00") } } } plugins { - id("com.gradle.develocity") version ("3.17.5") + id("com.gradle.develocity") version ("3.18.1") } develocity { diff --git a/sharedutils/build.gradle.kts b/sharedutils/build.gradle.kts index 44992ea03..e736a4133 100644 --- a/sharedutils/build.gradle.kts +++ b/sharedutils/build.gradle.kts @@ -42,6 +42,7 @@ dependencies { fullImplementation(libs.firebaseUiAuth) fullImplementation(libs.playServices) fullImplementation(libs.coroutinesPlayServices) + fullImplementation(libs.firebase.database.ktx) implementation(libs.coroutinesCore) implementation(libs.coroutinesAndroid)