From ab138410be3a1a7629a832fc80d23f56a1b0ad35 Mon Sep 17 00:00:00 2001 From: Sam Stern Date: Thu, 12 Sep 2019 15:55:32 -0700 Subject: [PATCH 1/4] Begin development of v6.0.1 Change-Id: I44761530f43e43f687173f7b867d50f5c39fe0a8 --- buildSrc/src/main/kotlin/Config.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt index 9b57eed64..549d23d4e 100644 --- a/buildSrc/src/main/kotlin/Config.kt +++ b/buildSrc/src/main/kotlin/Config.kt @@ -1,5 +1,5 @@ object Config { - const val version = "6.0.0" + const val version = "6.0.1-SNAPSHOT" val submodules = listOf("auth", "auth-github", "common", "firestore", "database", "storage") private const val kotlinVersion = "1.3.10" From 30aff80b5f6a4b02fa53be3cdf1665ea5d2cb41d Mon Sep 17 00:00:00 2001 From: Sam Stern Date: Fri, 13 Sep 2019 13:20:06 -0700 Subject: [PATCH 2/4] Preserve unused classes (#1678) --- auth/build.gradle.kts | 5 ++--- common/build.gradle.kts | 9 +++++++++ database/build.gradle.kts | 5 ++--- firestore/build.gradle.kts | 5 ++--- storage/build.gradle.kts | 9 +++++++++ 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts index 368c31a53..39225454e 100644 --- a/auth/build.gradle.kts +++ b/auth/build.gradle.kts @@ -3,9 +3,8 @@ import com.android.build.gradle.internal.dsl.TestOptions android { buildTypes { named("release").configure { - postprocessing { - consumerProguardFiles("auth-proguard.pro") - } + isMinifyEnabled = false + consumerProguardFiles("proguard-rules.pro") } } diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 165b6f445..1b8d1db33 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -1,3 +1,12 @@ +android { + buildTypes { + named("release").configure { + isMinifyEnabled = false + consumerProguardFiles("proguard-rules.pro") + } + } +} + dependencies { api(Config.Libs.Arch.runtime) api(Config.Libs.Arch.viewModel) diff --git a/database/build.gradle.kts b/database/build.gradle.kts index 0e4151c0e..587cdf577 100644 --- a/database/build.gradle.kts +++ b/database/build.gradle.kts @@ -7,9 +7,8 @@ android { buildTypes { named("release").configure { - postprocessing { - consumerProguardFiles("proguard-rules.pro") - } + isMinifyEnabled = false + consumerProguardFiles("proguard-rules.pro") } } } diff --git a/firestore/build.gradle.kts b/firestore/build.gradle.kts index 911b6b23e..ec8569bc2 100644 --- a/firestore/build.gradle.kts +++ b/firestore/build.gradle.kts @@ -8,9 +8,8 @@ android { buildTypes { named("release").configure { - postprocessing { - consumerProguardFiles("proguard-rules.pro") - } + isMinifyEnabled = false + consumerProguardFiles("proguard-rules.pro") } } } diff --git a/storage/build.gradle.kts b/storage/build.gradle.kts index c547b53d5..75bdf40ab 100644 --- a/storage/build.gradle.kts +++ b/storage/build.gradle.kts @@ -1,3 +1,12 @@ +android { + buildTypes { + named("release").configure { + isMinifyEnabled = false + consumerProguardFiles("proguard-rules.pro") + } + } +} + dependencies { api(Config.Libs.Misc.glide) From 5e7bec61dcceb51ebebab5b83d12e26a3c9a993b Mon Sep 17 00:00:00 2001 From: Sam Stern Date: Fri, 13 Sep 2019 13:24:49 -0700 Subject: [PATCH 3/4] Update MaterialProgressBar to get AndroidX Change-Id: Id59ebb16eb7b6174ebd428f198e16d538a44e7c1 --- buildSrc/src/main/kotlin/Config.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt index 549d23d4e..bbcb97e82 100644 --- a/buildSrc/src/main/kotlin/Config.kt +++ b/buildSrc/src/main/kotlin/Config.kt @@ -92,7 +92,7 @@ object Config { const val butterKnifeCompiler = "com.jakewharton:butterknife-compiler:$butterVersion" const val permissions = "pub.devrel:easypermissions:3.0.0" - const val materialProgress = "me.zhanghai.android.materialprogressbar:library:1.4.2" + const val materialProgress = "me.zhanghai.android.materialprogressbar:library:1.6.1" } object Test { From 31398d91430408015086aad5c6b2d2f27c9bdee1 Mon Sep 17 00:00:00 2001 From: Sam Stern Date: Fri, 13 Sep 2019 14:38:08 -0700 Subject: [PATCH 4/4] Version 6.0.1 Change-Id: Id0e2229d72a25269441f99380eb8c426286a2285 --- README.md | 8 ++++---- auth/README.md | 2 +- buildSrc/src/main/kotlin/Config.kt | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 1fc903cff..b9d5f3329 100644 --- a/README.md +++ b/README.md @@ -48,16 +48,16 @@ libraries. ```groovy dependencies { // FirebaseUI for Firebase Realtime Database - implementation 'com.firebaseui:firebase-ui-database:6.0.0' + implementation 'com.firebaseui:firebase-ui-database:6.0.1' // FirebaseUI for Cloud Firestore - implementation 'com.firebaseui:firebase-ui-firestore:6.0.0' + implementation 'com.firebaseui:firebase-ui-firestore:6.0.1' // FirebaseUI for Firebase Auth - implementation 'com.firebaseui:firebase-ui-auth:6.0.0' + implementation 'com.firebaseui:firebase-ui-auth:6.0.1' // FirebaseUI for Cloud Storage - implementation 'com.firebaseui:firebase-ui-storage:6.0.0' + implementation 'com.firebaseui:firebase-ui-storage:6.0.1' } ``` diff --git a/auth/README.md b/auth/README.md index 28a1e168d..3eca0a364 100644 --- a/auth/README.md +++ b/auth/README.md @@ -65,7 +65,7 @@ Gradle, add the dependency: ```groovy dependencies { // ... - implementation 'com.firebaseui:firebase-ui-auth:6.0.0' + implementation 'com.firebaseui:firebase-ui-auth:6.0.1' // Required only if Facebook login support is required // Find the latest Facebook SDK releases here: https://goo.gl/Ce5L94 diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt index bbcb97e82..2b99e3d2f 100644 --- a/buildSrc/src/main/kotlin/Config.kt +++ b/buildSrc/src/main/kotlin/Config.kt @@ -1,5 +1,5 @@ object Config { - const val version = "6.0.1-SNAPSHOT" + const val version = "6.0.1" val submodules = listOf("auth", "auth-github", "common", "firestore", "database", "storage") private const val kotlinVersion = "1.3.10"