Skip to content

Commit d3347f2

Browse files
authored
Use Firebase BOM (#1752)
1 parent 4653e31 commit d3347f2

File tree

8 files changed

+36
-22
lines changed

8 files changed

+36
-22
lines changed

app/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ android {
3232
}
3333

3434
dependencies {
35-
implementation(Config.Libs.Firebase.core)
3635
implementation(Config.Libs.Androidx.design)
3736
implementation(Config.Libs.Androidx.multidex)
3837

auth/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ dependencies {
3434
implementation(Config.Libs.Androidx.lifecycleExtensions)
3535
annotationProcessor(Config.Libs.Androidx.lifecycleCompiler)
3636

37+
implementation(platform(Config.Libs.Firebase.bom))
3738
api(Config.Libs.Firebase.auth)
3839
api(Config.Libs.PlayServices.auth)
3940

build.gradle.kts

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ plugins {
2929
}
3030

3131
buildScan {
32-
setTermsOfServiceUrl("https://gradle.com/terms-of-service")
33-
setTermsOfServiceAgree("yes")
32+
termsOfServiceUrl = "https://gradle.com/terms-of-service"
33+
termsOfServiceAgree = "yes"
3434
}
3535

3636
// See https://github.com/gradle/kotlin-dsl/issues/607#issuecomment-375687119
@@ -110,8 +110,8 @@ fun Project.configureAndroid() {
110110
isAbortOnError = true
111111

112112
baselineFile = file("$configDir/lint-baseline.xml")
113-
htmlOutput = file("$reportsDir/lint-results.html")
114-
xmlOutput = file("$reportsDir/lint-results.xml")
113+
// htmlOutput = file("$reportsDir/lint-results.html")
114+
// xmlOutput = file("$reportsDir/lint-results.xml")
115115
}
116116
}
117117
}
@@ -298,22 +298,34 @@ fun Project.setupPublishing() {
298298

299299
withXml {
300300
asNode().appendNode("dependencies").apply {
301-
fun Dependency.write(scope: String) = appendNode("dependency").apply {
302-
appendNode("groupId", group)
303-
appendNode("artifactId", if (group == groupName) {
304-
"firebase-ui-$name"
301+
fun ResolvedDependency.write(scope: String) = appendNode("dependency").apply {
302+
val publicArtifactId = if (moduleGroup == groupName) {
303+
"firebase-ui-$moduleName"
305304
} else {
306-
name
307-
})
308-
appendNode("version", version)
305+
moduleName
306+
}
307+
appendNode("groupId", moduleGroup)
308+
appendNode("artifactId", publicArtifactId)
309+
appendNode("version", moduleVersion)
309310
appendNode("scope", scope)
310311
}
311312

312-
for (dependency in configurations["api"].dependencies) {
313-
dependency.write("compile")
313+
val apiDependencyNames = configurations["api"].dependencies.map {
314+
it.name
314315
}
315-
for (dependency in configurations["implementation"].dependencies) {
316-
dependency.write("runtime")
316+
317+
val implementationDependencyNames = configurations["implementation"].dependencies.map {
318+
it.name
319+
}
320+
321+
configurations["releaseCompileClasspath"].resolvedConfiguration.firstLevelModuleDependencies.forEach {
322+
if (apiDependencyNames.contains(it.moduleName)) {
323+
it.write("compile")
324+
}
325+
326+
if (implementationDependencyNames.contains(it.moduleName)) {
327+
it.write("runtime")
328+
}
317329
}
318330
}
319331
}

buildSrc/src/main/kotlin/Config.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ object Config {
4343
}
4444

4545
object Firebase {
46-
const val auth = "com.google.firebase:firebase-auth:19.2.0"
47-
const val core = "com.google.firebase:firebase-core:17.2.1"
48-
const val database = "com.google.firebase:firebase-database:19.2.0"
49-
const val firestore = "com.google.firebase:firebase-firestore:21.3.1"
50-
const val storage = "com.google.firebase:firebase-storage:19.1.0"
46+
const val bom = "com.google.firebase:firebase-bom:25.1.0"
47+
const val auth = "com.google.firebase:firebase-auth"
48+
const val database = "com.google.firebase:firebase-database"
49+
const val firestore = "com.google.firebase:firebase-firestore"
50+
const val storage = "com.google.firebase:firebase-storage"
5151
}
5252

5353
object PlayServices {

database/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ android {
1414
}
1515

1616
dependencies {
17+
implementation(platform(Config.Libs.Firebase.bom))
1718
api(project(":common"))
1819
api(Config.Libs.Firebase.database)
1920

firestore/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ android {
1515
}
1616

1717
dependencies {
18+
implementation(platform(Config.Libs.Firebase.bom))
1819
api(project(":common"))
1920
api(Config.Libs.Firebase.firestore)
2021

proguard-tests/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ dependencies {
3838
implementation(project(":database"))
3939
implementation(project(":storage"))
4040

41-
implementation(Config.Libs.Firebase.core)
4241
implementation(Config.Libs.Androidx.lifecycleExtensions)
4342
}
4443

storage/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ android {
1010
dependencies {
1111
api(Config.Libs.Misc.glide)
1212

13+
implementation(platform(Config.Libs.Firebase.bom))
1314
api(Config.Libs.Firebase.storage)
1415
// Override Play Services
1516
implementation(Config.Libs.Androidx.legacySupportv4)

0 commit comments

Comments
 (0)