Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("org.jetbrains.kotlin.plugin.compose")
id("com.google.gms.google-services")
}
Expand Down
5 changes: 3 additions & 2 deletions auth/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins {
id("com.android.library")
id("com.vanniktech.maven.publish")
id("org.jetbrains.kotlin.android")
alias(libs.plugins.kotlin.compose)
}

Expand All @@ -16,7 +17,7 @@ android {
buildConfigField("String", "LIBRARY_NAME", "\"firebase-ui-android\"")
buildConfigField("String", "VERSION_NAME", "\"${Config.version}\"")

resourcePrefix = "fui_"
resourcePrefix("fui_")
vectorDrawables.useSupportLibrary = true
}

Expand Down Expand Up @@ -105,7 +106,7 @@ dependencies {
implementation(libs.zxing.core)
annotationProcessor(libs.androidx.lifecycle.compiler)

api(platform(libs.firebase.bom))
implementation(platform(libs.firebase.bom))
Comment thread
demolaf marked this conversation as resolved.
api(libs.firebase.auth)

// Phone number validation
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Config.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ object Config {
val submodules = listOf("auth", "common", "firestore", "database", "storage")

object SdkVersions {
const val compile = 37
const val compile = 36
const val target = 36
const val min = 23
}
Expand Down
2 changes: 1 addition & 1 deletion common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ android {
defaultConfig {
minSdk = Config.SdkVersions.min

resourcePrefix = "fui_"
resourcePrefix("fui_")
vectorDrawables.useSupportLibrary = true
}

Expand Down
4 changes: 2 additions & 2 deletions database/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ android {
defaultConfig {
minSdk = Config.SdkVersions.min

resourcePrefix = "fui_"
resourcePrefix("fui_")
vectorDrawables.useSupportLibrary = true

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -55,7 +55,7 @@ android {
}

dependencies {
api(platform(libs.firebase.bom))
implementation(platform(libs.firebase.bom))
Comment thread
demolaf marked this conversation as resolved.
api(project(":common"))
api(libs.firebase.database)

Expand Down
1 change: 1 addition & 0 deletions e2eTest/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id("com.android.library")
id("org.jetbrains.kotlin.android")
alias(libs.plugins.kotlin.compose)
}

Expand Down
4 changes: 2 additions & 2 deletions firestore/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ android {
defaultConfig {
minSdk = Config.SdkVersions.min

resourcePrefix = "fui_"
resourcePrefix("fui_")
vectorDrawables.useSupportLibrary = true

multiDexEnabled = true
Expand Down Expand Up @@ -51,7 +51,7 @@ android {
}

dependencies {
api(platform(libs.firebase.bom))
implementation(platform(libs.firebase.bom))
Comment thread
demolaf marked this conversation as resolved.
api(project(":common"))
api(libs.firebase.firestore)

Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
kotlin = "2.2.0"
android-gradle-plugin = "9.2.1"
google-services = "4.5.0"
android-gradle-plugin = "8.10.0"
google-services = "4.3.8"
maven-publish-plugin = "0.34.0"
versions-plugin = "0.20.0"

Expand All @@ -26,7 +26,7 @@ datastore = "1.1.1"
fragment = "1.3.5"
googleid = "1.1.1"
legacy-support-v4 = "1.0.0"
lifecycle = "2.11.0"
lifecycle = "2.3.1"
lifecycle-extensions = "2.2.0"
libphonenumber = "9.0.16"
material = "1.4.0"
Expand Down
2 changes: 1 addition & 1 deletion internal/lintchecks/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ android {
defaultConfig {
minSdk = Config.SdkVersions.min

resourcePrefix = "fui_"
resourcePrefix("fui_")
vectorDrawables.useSupportLibrary = true

multiDexEnabled = true
Expand Down
2 changes: 1 addition & 1 deletion library/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ android {
defaultConfig {
minSdk = Config.SdkVersions.min

resourcePrefix = "fui_"
resourcePrefix("fui_")
vectorDrawables.useSupportLibrary = true
}

Expand Down
9 changes: 6 additions & 3 deletions proguard-tests/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ android {
versionName = Config.version
versionCode = 1

resourcePrefix = "fui_"
resourcePrefix("fui_")
vectorDrawables.useSupportLibrary = true

multiDexEnabled = true
Expand All @@ -35,8 +35,11 @@ android {
// using the debug key
signingConfig = signingConfigs["debug"]

isMinifyEnabled = true
isShrinkResources = true
postprocessing {
isRemoveUnusedCode = true
isRemoveUnusedResources = true
isObfuscate = true
}
Comment thread
demolaf marked this conversation as resolved.
}
}

Expand Down
4 changes: 2 additions & 2 deletions storage/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ android {
defaultConfig {
minSdk = Config.SdkVersions.min

resourcePrefix = "fui_"
resourcePrefix("fui_")
vectorDrawables.useSupportLibrary = true
}

Expand Down Expand Up @@ -50,7 +50,7 @@ android {
dependencies {
api(libs.glide)

api(platform(libs.firebase.bom))
implementation(platform(libs.firebase.bom))
Comment thread
demolaf marked this conversation as resolved.
api(libs.firebase.storage)
// Override Play Services
implementation(libs.androidx.legacy.support.v4)
Expand Down
Loading