From d2b733685ed1c0b877b74ece1e5b825620e927b5 Mon Sep 17 00:00:00 2001 From: Vladimir Kryachko Date: Mon, 17 Jun 2019 14:57:53 -0400 Subject: [PATCH 1/4] Update deps to post-androidx gms versions. Additionally configure sources.jar for SDKs. --- fiamui-app/fiamui-app.gradle | 8 ++++---- firebase-common/firebase-common.gradle | 4 ++-- firebase-common/gradle.properties | 4 ++-- .../firebase-database-collection.gradle | 2 +- firebase-database-collection/gradle.properties | 4 ++-- firebase-database/firebase-database.gradle | 8 ++++---- firebase-database/gradle.properties | 4 ++-- firebase-datatransport/gradle.properties | 4 ++-- firebase-firestore/firebase-firestore.gradle | 8 ++++---- firebase-firestore/gradle.properties | 4 ++-- firebase-firestore/ktx/ktx.gradle | 1 + firebase-functions/firebase-functions.gradle | 10 +++++----- firebase-functions/gradle.properties | 4 ++-- .../firebase-inappmessaging-display.gradle | 2 +- firebase-inappmessaging-display/gradle.properties | 3 ++- firebase-storage/firebase-storage.gradle | 7 ++++--- firebase-storage/gradle.properties | 4 ++-- protolite-well-known-types/gradle.properties | 4 ++-- transport/transport-api/gradle.properties | 4 ++-- transport/transport-backend-cct/gradle.properties | 4 ++-- transport/transport-runtime/gradle.properties | 4 ++-- 21 files changed, 50 insertions(+), 47 deletions(-) diff --git a/fiamui-app/fiamui-app.gradle b/fiamui-app/fiamui-app.gradle index 4b3b3659e8e..05bf7d1f616 100644 --- a/fiamui-app/fiamui-app.gradle +++ b/fiamui-app/fiamui-app.gradle @@ -53,11 +53,11 @@ android { dependencies { implementation project(path: ":firebase-inappmessaging-display") - implementation "com.google.firebase:firebase-measurement-connector:17.0.1" - implementation('com.google.firebase:firebase-inappmessaging:17.0.3') { + implementation "com.google.firebase:firebase-measurement-connector:18.0.0" + implementation('com.google.firebase:firebase-inappmessaging:18.0.0') { exclude group: 'com.google.firebase', module: 'firebase-common' } - implementation('com.google.firebase:firebase-analytics:16.0.4') { + implementation('com.google.firebase:firebase-analytics:17.0.0') { exclude group: 'com.google.firebase', module: 'firebase-common' } @@ -67,7 +67,7 @@ dependencies { implementation "com.google.code.findbugs:jsr305:3.0.2" implementation "com.squareup.okhttp:okhttp:2.7.5" implementation "com.google.auto.value:auto-value-annotations:1.6.5" - implementation "com.google.android.gms:play-services-basement:16.2.0" + implementation "com.google.android.gms:play-services-basement:17.0.0" // The following dependencies are not required to use the FIAM UI library. // They are used to make some aspects of the demo app implementation simpler for diff --git a/firebase-common/firebase-common.gradle b/firebase-common/firebase-common.gradle index ed68cd80597..2a8c84ce1e6 100644 --- a/firebase-common/firebase-common.gradle +++ b/firebase-common/firebase-common.gradle @@ -58,8 +58,8 @@ android { } dependencies { - implementation 'com.google.android.gms:play-services-basement:16.2.0' - implementation "com.google.android.gms:play-services-tasks:16.0.1" + implementation 'com.google.android.gms:play-services-basement:17.0.0' + implementation "com.google.android.gms:play-services-tasks:17.0.0" api 'com.google.auto.value:auto-value-annotations:1.6.5' compileOnly 'com.google.code.findbugs:jsr305:3.0.2' diff --git a/firebase-common/gradle.properties b/firebase-common/gradle.properties index 5328ce212de..9b7be4891d1 100644 --- a/firebase-common/gradle.properties +++ b/firebase-common/gradle.properties @@ -1,2 +1,2 @@ -version=17.1.1 -latestReleasedVersion=17.1.0 +version=18.0.1 +latestReleasedVersion=18.0.0 diff --git a/firebase-database-collection/firebase-database-collection.gradle b/firebase-database-collection/firebase-database-collection.gradle index 1d29321dd24..a9d5af2f3c3 100644 --- a/firebase-database-collection/firebase-database-collection.gradle +++ b/firebase-database-collection/firebase-database-collection.gradle @@ -29,7 +29,7 @@ android { } dependencies { - implementation 'com.google.android.gms:play-services-base:16.1.0' + implementation 'com.google.android.gms:play-services-base:17.0.0' testImplementation 'junit:junit:4.12' testImplementation 'net.java:quickcheck:0.6' diff --git a/firebase-database-collection/gradle.properties b/firebase-database-collection/gradle.properties index c763f64467b..54be3eb478f 100644 --- a/firebase-database-collection/gradle.properties +++ b/firebase-database-collection/gradle.properties @@ -1,2 +1,2 @@ -version=16.0.2 -latestReleasedVersion=16.0.1 +version=17.0.1 +latestReleasedVersion=17.0.0 diff --git a/firebase-database/firebase-database.gradle b/firebase-database/firebase-database.gradle index b6ef29308c9..b68e911ad69 100644 --- a/firebase-database/firebase-database.gradle +++ b/firebase-database/firebase-database.gradle @@ -73,10 +73,10 @@ dependencies { implementation project(':firebase-common') implementation project(':firebase-database-collection') - implementation 'com.google.android.gms:play-services-basement:16.2.0' - implementation 'com.google.android.gms:play-services-base:16.1.0' - implementation 'com.google.android.gms:play-services-tasks:16.0.1' - implementation('com.google.firebase:firebase-auth-interop:17.0.0') { + implementation 'com.google.android.gms:play-services-basement:17.0.0' + implementation 'com.google.android.gms:play-services-base:17.0.0' + implementation 'com.google.android.gms:play-services-tasks:17.0.0' + implementation('com.google.firebase:firebase-auth-interop:18.0.0') { exclude group: "com.google.firebase", module: "firebase-common" } diff --git a/firebase-database/gradle.properties b/firebase-database/gradle.properties index f4ae1a57594..b2337aeb5ba 100644 --- a/firebase-database/gradle.properties +++ b/firebase-database/gradle.properties @@ -12,6 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version=17.0.0 -latestReleasedVersion=16.1.0 +version=18.0.1 +latestReleasedVersion=18.0.0 android.enableUnitTestBinaryResources=true diff --git a/firebase-datatransport/gradle.properties b/firebase-datatransport/gradle.properties index 03f6ea19074..a8dce55d4ea 100644 --- a/firebase-datatransport/gradle.properties +++ b/firebase-datatransport/gradle.properties @@ -1,3 +1,3 @@ -version=16.0.1 -latestReleasedVersion=16.0.0 +version=17.0.1 +latestReleasedVersion=17.0.0 android.enableUnitTestBinaryResources=true diff --git a/firebase-firestore/firebase-firestore.gradle b/firebase-firestore/firebase-firestore.gradle index f92916e98a1..9d8d86a686f 100644 --- a/firebase-firestore/firebase-firestore.gradle +++ b/firebase-firestore/firebase-firestore.gradle @@ -106,13 +106,13 @@ dependencies { implementation 'io.grpc:grpc-protobuf-lite:1.21.0' implementation 'io.grpc:grpc-okhttp:1.21.0' implementation 'io.grpc:grpc-android:1.21.0' - implementation 'com.google.android.gms:play-services-basement:16.2.0' - implementation 'com.google.android.gms:play-services-tasks:16.0.1' - implementation 'com.google.android.gms:play-services-base:16.1.0' + implementation 'com.google.android.gms:play-services-basement:17.0.0' + implementation 'com.google.android.gms:play-services-tasks:17.0.0' + implementation 'com.google.android.gms:play-services-base:17.0.0' implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava' implementation 'com.squareup.okhttp:okhttp:2.7.5' - implementation('com.google.firebase:firebase-auth-interop:17.0.0') { + implementation('com.google.firebase:firebase-auth-interop:18.0.0') { exclude group: "com.google.firebase", module: "firebase-common" } diff --git a/firebase-firestore/gradle.properties b/firebase-firestore/gradle.properties index 04d7bc444aa..ae8d704fb56 100644 --- a/firebase-firestore/gradle.properties +++ b/firebase-firestore/gradle.properties @@ -1,2 +1,2 @@ -version=19.0.2 -latestReleasedVersion=19.0.1 +version=20.0.1 +latestReleasedVersion=20.0.0 diff --git a/firebase-firestore/ktx/ktx.gradle b/firebase-firestore/ktx/ktx.gradle index cad7aece2d9..e11389638cd 100644 --- a/firebase-firestore/ktx/ktx.gradle +++ b/firebase-firestore/ktx/ktx.gradle @@ -19,6 +19,7 @@ plugins { firebaseLibrary { releaseWith project(':firebase-firestore') + publishSources = true } android { diff --git a/firebase-functions/firebase-functions.gradle b/firebase-functions/firebase-functions.gradle index 76b05eb9013..dce829719ba 100644 --- a/firebase-functions/firebase-functions.gradle +++ b/firebase-functions/firebase-functions.gradle @@ -50,16 +50,16 @@ android { dependencies { implementation project(':firebase-common') - implementation 'com.google.android.gms:play-services-basement:16.2.0' - implementation 'com.google.android.gms:play-services-base:16.1.0' - implementation 'com.google.android.gms:play-services-tasks:16.0.1' - implementation ('com.google.firebase:firebase-iid:18.0.0') { + implementation 'com.google.android.gms:play-services-basement:17.0.0' + implementation 'com.google.android.gms:play-services-base:17.0.0' + implementation 'com.google.android.gms:play-services-tasks:17.0.0' + implementation ('com.google.firebase:firebase-iid:19.0.0') { exclude group: 'com.google.firebase', module: 'firebase-common' } implementation ('com.google.firebase:firebase-auth-interop:17.0.0') { exclude group: 'com.google.firebase', module: 'firebase-common' } - implementation 'com.google.firebase:firebase-iid-interop:16.0.1' + implementation 'com.google.firebase:firebase-iid-interop:17.0.0' implementation 'com.squareup.okhttp3:okhttp:3.12.1' diff --git a/firebase-functions/gradle.properties b/firebase-functions/gradle.properties index 95298508ab1..904cf7b5e5a 100644 --- a/firebase-functions/gradle.properties +++ b/firebase-functions/gradle.properties @@ -1,3 +1,3 @@ -version=17.0.0 -latestReleasedVersion=16.3.0 +version=18.0.1 +latestReleasedVersion=18.0.0 android.enableUnitTestBinaryResources=true diff --git a/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle b/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle index eaa131899f6..b72ede99e5f 100644 --- a/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle +++ b/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle @@ -54,7 +54,7 @@ android { dependencies { implementation project(':firebase-common') - implementation ("com.google.firebase:firebase-inappmessaging:17.0.3") { + implementation ("com.google.firebase:firebase-inappmessaging:18.0.0") { exclude group: "com.google.firebase", module: "firebase-common" } diff --git a/firebase-inappmessaging-display/gradle.properties b/firebase-inappmessaging-display/gradle.properties index 90ec8c308f9..9b7be4891d1 100644 --- a/firebase-inappmessaging-display/gradle.properties +++ b/firebase-inappmessaging-display/gradle.properties @@ -1 +1,2 @@ -version=17.0.5 +version=18.0.1 +latestReleasedVersion=18.0.0 diff --git a/firebase-storage/firebase-storage.gradle b/firebase-storage/firebase-storage.gradle index 4abc6369812..2fa2abb6542 100644 --- a/firebase-storage/firebase-storage.gradle +++ b/firebase-storage/firebase-storage.gradle @@ -20,6 +20,7 @@ plugins { firebaseLibrary { testLab.enabled = true publishJavadoc = true + publishSources = true } android { @@ -76,9 +77,9 @@ android { dependencies { implementation project(':firebase-common') - implementation 'com.google.android.gms:play-services-base:16.1.0' - implementation 'com.google.android.gms:play-services-tasks:16.0.1' - implementation('com.google.firebase:firebase-auth-interop:17.0.0') { + implementation 'com.google.android.gms:play-services-base:17.0.0' + implementation 'com.google.android.gms:play-services-tasks:17.0.0' + implementation('com.google.firebase:firebase-auth-interop:18.0.0') { exclude group: "com.google.firebase", module: "firebase-common" } diff --git a/firebase-storage/gradle.properties b/firebase-storage/gradle.properties index f4ae1a57594..b2337aeb5ba 100644 --- a/firebase-storage/gradle.properties +++ b/firebase-storage/gradle.properties @@ -12,6 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version=17.0.0 -latestReleasedVersion=16.1.0 +version=18.0.1 +latestReleasedVersion=18.0.0 android.enableUnitTestBinaryResources=true diff --git a/protolite-well-known-types/gradle.properties b/protolite-well-known-types/gradle.properties index c763f64467b..54be3eb478f 100644 --- a/protolite-well-known-types/gradle.properties +++ b/protolite-well-known-types/gradle.properties @@ -1,2 +1,2 @@ -version=16.0.2 -latestReleasedVersion=16.0.1 +version=17.0.1 +latestReleasedVersion=17.0.0 diff --git a/transport/transport-api/gradle.properties b/transport/transport-api/gradle.properties index a9aff5b2e2e..983642acd1f 100644 --- a/transport/transport-api/gradle.properties +++ b/transport/transport-api/gradle.properties @@ -12,5 +12,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -version=1.0.1 -latestReleasedVersion=1.0.0 +version=2.0.1 +latestReleasedVersion=2.0.0 diff --git a/transport/transport-backend-cct/gradle.properties b/transport/transport-backend-cct/gradle.properties index 4e6041d681d..7708203d64e 100644 --- a/transport/transport-backend-cct/gradle.properties +++ b/transport/transport-backend-cct/gradle.properties @@ -12,6 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version=1.0.1 -latestReleasedVersion=1.0.0 +version=2.0.1 +latestReleasedVersion=2.0.0 firebaseSkipPreguard=false diff --git a/transport/transport-runtime/gradle.properties b/transport/transport-runtime/gradle.properties index 0cbb89724a3..18a78760e82 100644 --- a/transport/transport-runtime/gradle.properties +++ b/transport/transport-runtime/gradle.properties @@ -12,6 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -version=1.0.1 -latestReleasedVersion=1.0.0 +version=2.0.1 +latestReleasedVersion=2.0.0 android.enableUnitTestBinaryResources=true From fda50427a2819ffb3a6ed20e7588678dca63caa2 Mon Sep 17 00:00:00 2001 From: Vladimir Kryachko Date: Mon, 17 Jun 2019 15:05:18 -0400 Subject: [PATCH 2/4] Update functions-ktx deps --- firebase-functions/ktx/ktx.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firebase-functions/ktx/ktx.gradle b/firebase-functions/ktx/ktx.gradle index ad6ed5216b0..f2ce73b2641 100644 --- a/firebase-functions/ktx/ktx.gradle +++ b/firebase-functions/ktx/ktx.gradle @@ -50,7 +50,7 @@ dependencies { implementation project(':firebase-common:ktx') implementation project(':firebase-functions') implementation 'androidx.annotation:annotation:1.1.0' - implementation 'com.google.android.gms:play-services-tasks:16.0.1' + implementation 'com.google.android.gms:play-services-tasks:17.0.0' androidTestImplementation 'junit:junit:4.12' androidTestImplementation "com.google.truth:truth:$googleTruthVersion" From beb2d325ec6fad9c834720540164c86726795ae2 Mon Sep 17 00:00:00 2001 From: Vladimir Kryachko Date: Mon, 17 Jun 2019 16:12:52 -0400 Subject: [PATCH 3/4] Fix versions. --- .../firebase-inappmessaging-display.gradle | 2 +- firebase-inappmessaging-display/gradle.properties | 3 +-- firebase-storage/test-app/test-app.gradle | 8 ++++---- tools/measurement/apksize/src/firestore/firestore.gradle | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle b/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle index b72ede99e5f..eaa131899f6 100644 --- a/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle +++ b/firebase-inappmessaging-display/firebase-inappmessaging-display.gradle @@ -54,7 +54,7 @@ android { dependencies { implementation project(':firebase-common') - implementation ("com.google.firebase:firebase-inappmessaging:18.0.0") { + implementation ("com.google.firebase:firebase-inappmessaging:17.0.3") { exclude group: "com.google.firebase", module: "firebase-common" } diff --git a/firebase-inappmessaging-display/gradle.properties b/firebase-inappmessaging-display/gradle.properties index 9b7be4891d1..90ec8c308f9 100644 --- a/firebase-inappmessaging-display/gradle.properties +++ b/firebase-inappmessaging-display/gradle.properties @@ -1,2 +1 @@ -version=18.0.1 -latestReleasedVersion=18.0.0 +version=17.0.5 diff --git a/firebase-storage/test-app/test-app.gradle b/firebase-storage/test-app/test-app.gradle index b45d4f1b021..ab9fadb4dfd 100644 --- a/firebase-storage/test-app/test-app.gradle +++ b/firebase-storage/test-app/test-app.gradle @@ -49,10 +49,10 @@ dependencies { // We intentionally use an open ended version to pick up any SNAPSHOT // versions published to the root project' s build/ directory. - implementation 'com.google.firebase:firebase-auth:17+' - implementation 'com.google.firebase:firebase-common:17+' - implementation 'com.google.android.gms:play-services-basement:16.2.0' - implementation 'com.google.android.gms:play-services-base:16.1.0' + implementation 'com.google.firebase:firebase-auth:18+' + implementation 'com.google.firebase:firebase-common:18+' + implementation 'com.google.android.gms:play-services-basement:17.0.0' + implementation 'com.google.android.gms:play-services-base:17.0.0' implementation 'com.google.android.material:material:1.0.0' implementation 'androidx.appcompat:appcompat:1.0.2' diff --git a/tools/measurement/apksize/src/firestore/firestore.gradle b/tools/measurement/apksize/src/firestore/firestore.gradle index 6b78e0f5598..f8640c43e7c 100644 --- a/tools/measurement/apksize/src/firestore/firestore.gradle +++ b/tools/measurement/apksize/src/firestore/firestore.gradle @@ -31,6 +31,6 @@ android { dependencies { firestoreImplementation project(":firebase-firestore") firestoreImplementation "com.google.android.gms:play-services-auth:16.0.1" - firestoreImplementation "com.google.android.gms:play-services-base:16.1.0" + firestoreImplementation "com.google.android.gms:play-services-base:17.0.0" firestoreImplementation 'androidx.legacy:legacy-support-v4:1.0.0' } From ee0c051b00372f04cb6b8ad5ee5d1d5f07f04387 Mon Sep 17 00:00:00 2001 From: Vladimir Kryachko Date: Mon, 17 Jun 2019 16:27:17 -0400 Subject: [PATCH 4/4] unbump fiam version in fiamui-app --- fiamui-app/fiamui-app.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fiamui-app/fiamui-app.gradle b/fiamui-app/fiamui-app.gradle index 05bf7d1f616..3382bd3ce27 100644 --- a/fiamui-app/fiamui-app.gradle +++ b/fiamui-app/fiamui-app.gradle @@ -54,7 +54,7 @@ android { dependencies { implementation project(path: ":firebase-inappmessaging-display") implementation "com.google.firebase:firebase-measurement-connector:18.0.0" - implementation('com.google.firebase:firebase-inappmessaging:18.0.0') { + implementation('com.google.firebase:firebase-inappmessaging:17.0.3') { exclude group: 'com.google.firebase', module: 'firebase-common' } implementation('com.google.firebase:firebase-analytics:17.0.0') {