From 2a89f35222d795e8fbf874c4cd656181ce0988bc Mon Sep 17 00:00:00 2001 From: Daniel Frett Date: Mon, 18 Sep 2023 13:44:38 -0600 Subject: [PATCH 1/7] fix code style for the version catalog --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ab93368934..c9024473c8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -171,7 +171,7 @@ kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-te kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } kotlin-kover-gradlePlugin = { module = "org.jetbrains.kotlinx:kover-gradle-plugin", version.ref = "kotlinKover" } kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } -ktlint-gradle = { module = "org.jlleitschuh.gradle:ktlint-gradle", version.ref = "ktlintGradle"} +ktlint-gradle = { module = "org.jlleitschuh.gradle:ktlint-gradle", version.ref = "ktlintGradle" } leakcanary = "com.squareup.leakcanary:leakcanary-android:2.12" lottie = { module = "com.airbnb.android:lottie", version.ref = "lottie" } lottie-compose = { module = "com.airbnb.android:lottie-compose", version.ref = "lottie" } From 2422b422bdfe6c0bc18288d357456d6ca23ca221 Mon Sep 17 00:00:00 2001 From: Daniel Frett Date: Mon, 18 Sep 2023 13:45:02 -0600 Subject: [PATCH 2/7] stop using deprecated buildDir --- app/build.gradle.kts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3aa4b29489..c7422c9e82 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -229,8 +229,9 @@ dependencies { // region Firebase App Distribution if (project.hasProperty("firebaseAppDistributionBuild")) { firebaseAppDistribution { - artifactPath = - buildDir.resolve("outputs/apk_from_bundle/productionQa/app-production-qa-universal.apk").path + artifactPath = layout.buildDirectory + .file("outputs/apk_from_bundle/productionQa/app-production-qa-universal.apk") + .get().asFile.path releaseNotes = generateFirebaseAppDistributionReleaseNotes() serviceCredentialsFile = rootProject.file("firebase/firebase_api_key.json").path groups = "android-testers" From ada5e02813d9db8d0f0f0d892c234e3fcd090e46 Mon Sep 17 00:00:00 2001 From: Daniel Frett Date: Mon, 18 Sep 2023 09:52:50 -0600 Subject: [PATCH 3/7] Transition google-services plugin to modern mechanism of including it --- app/build.gradle.kts | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c7422c9e82..b12eae8aa8 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -4,7 +4,7 @@ plugins { id("com.google.firebase.appdistribution") id("com.google.firebase.crashlytics") id("com.google.firebase.firebase-perf") - id("com.google.gms.google-services") + alias(libs.plugins.google.services) alias(libs.plugins.grgit) alias(libs.plugins.hilt) } diff --git a/build.gradle b/build.gradle index 1826f3cfee..69fcce1ba3 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,6 @@ buildscript { classpath libs.firebase.appdistribution.gradlePlugin classpath libs.firebase.crashlytics.gradlePlugin classpath libs.firebase.perf.gradlePlugin - classpath libs.google.services.gradlePlugin classpath libs.kotlin.gradlePlugin } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c9024473c8..f9511779f0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -106,7 +106,6 @@ godtoolsShared-parser = { module = "org.cru.godtools.kotlin:parser", version.ref godtoolsShared-user-activity = { module = "org.cru.godtools.kotlin:user-activity", version.ref = "godtoolsShared" } google-auto-value = { module = "com.google.auto.value:auto-value", version.ref = "google-auto-value" } google-auto-value-annotations = { module = "com.google.auto.value:auto-value-annotations", version.ref = "google-auto-value" } -google-services-gradlePlugin = "com.google.gms:google-services:4.4.0" gradleDownloadTask = "de.undercouch:gradle-download-task:5.5.0" gtoSupport-androidx-collection = { module = "org.ccci.gto.android:gto-support-androidx-collection", version.ref = "gtoSupport" } gtoSupport-androidx-compose = { module = "org.ccci.gto.android:gto-support-androidx-compose", version.ref = "gtoSupport" } @@ -218,6 +217,7 @@ common = ["kotlin-stdlib", "timber"] test-framework = ["junit", "androidx-test-junit", "mockk", "robolectric"] [plugins] +google-services = { id = "com.google.gms.google-services", version = "4.4.0" } grgit = { id = "org.ajoberstar.grgit", version = "5.2.0" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } ksp = { id = "com.google.devtools.ksp", version = "1.9.10-1.0.13" } From ec93bb74545e4841e8301d202d7c20994e27196b Mon Sep 17 00:00:00 2001 From: Daniel Frett Date: Mon, 18 Sep 2023 10:55:26 -0600 Subject: [PATCH 4/7] update google-services.json --- app/google-services.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/app/google-services.json b/app/google-services.json index 1af6796bdf..d54d791143 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -21,10 +21,6 @@ "package_name": "org.keynote.godtools.android", "certificate_hash": "ee40b2e6569e1e242f69bf9dd839f6fb135337d8" } - }, - { - "client_id": "71275134527-roo71fe00mo561o79j6b9jveuocsq38i.apps.googleusercontent.com", - "client_type": 3 } ], "api_key": [ @@ -77,10 +73,6 @@ "package_name": "org.keynote.godtools.android.debug", "certificate_hash": "5a863ad7021d70e6cac9d3f47d297c2261222424" } - }, - { - "client_id": "71275134527-roo71fe00mo561o79j6b9jveuocsq38i.apps.googleusercontent.com", - "client_type": 3 } ], "api_key": [ @@ -125,10 +117,6 @@ "package_name": "org.keynote.godtools.android.qa", "certificate_hash": "e759fc0eb96d7e32a0c627209ea35bb84fd28866" } - }, - { - "client_id": "71275134527-roo71fe00mo561o79j6b9jveuocsq38i.apps.googleusercontent.com", - "client_type": 3 } ], "api_key": [ From 923f51246dddc8adb0572cf6db73ad48cf395eb1 Mon Sep 17 00:00:00 2001 From: Daniel Frett Date: Mon, 18 Sep 2023 11:04:59 -0600 Subject: [PATCH 5/7] Update the app distribution plugin to be configured in the modern plugins block --- app/build.gradle.kts | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b12eae8aa8..0b8772392b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,9 +1,9 @@ plugins { id("godtools.application-conventions") kotlin("kapt") - id("com.google.firebase.appdistribution") id("com.google.firebase.crashlytics") id("com.google.firebase.firebase-perf") + alias(libs.plugins.firebase.appdistribution) alias(libs.plugins.google.services) alias(libs.plugins.grgit) alias(libs.plugins.hilt) diff --git a/build.gradle b/build.gradle index 69fcce1ba3..095548aa92 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,6 @@ buildscript { classpath libs.gradleDownloadTask classpath libs.android.gradlePlugin - classpath libs.firebase.appdistribution.gradlePlugin classpath libs.firebase.crashlytics.gradlePlugin classpath libs.firebase.perf.gradlePlugin classpath libs.kotlin.gradlePlugin diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f9511779f0..ccd5239f8c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -90,7 +90,6 @@ facebook-flipper = { module = "com.facebook.flipper:flipper", version.ref = "fac facebook-flipper-plugins-leakcanary2 = { module = "com.facebook.flipper:flipper-leakcanary2-plugin", version.ref = "facebook-flipper" } facebook-flipper-plugins-network = { module = "com.facebook.flipper:flipper-network-plugin", version.ref = "facebook-flipper" } facebook-soloader = "com.facebook.soloader:soloader:0.10.5" -firebase-appdistribution-gradlePlugin = "com.google.firebase:firebase-appdistribution-gradle:4.0.0" firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics", version.ref = "firebase-crashlytics" } firebase-crashlytics-gradlePlugin = "com.google.firebase:firebase-crashlytics-gradle:2.9.9" firebase-crashlytics-ndk = { module = "com.google.firebase:firebase-crashlytics-ndk", version.ref = "firebase-crashlytics" } @@ -217,6 +216,7 @@ common = ["kotlin-stdlib", "timber"] test-framework = ["junit", "androidx-test-junit", "mockk", "robolectric"] [plugins] +firebase-appdistribution = { id = "com.google.firebase.appdistribution", version = "4.0.0" } google-services = { id = "com.google.gms.google-services", version = "4.4.0" } grgit = { id = "org.ajoberstar.grgit", version = "5.2.0" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } From 2f577962738758da6b3d0e2acae35f8729d2ee19 Mon Sep 17 00:00:00 2001 From: Daniel Frett Date: Mon, 18 Sep 2023 15:40:49 -0600 Subject: [PATCH 6/7] Update firebase performance plugin to utilize modern gradle plugin syntax --- app/build.gradle.kts | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0b8772392b..ded9095c13 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -2,8 +2,8 @@ plugins { id("godtools.application-conventions") kotlin("kapt") id("com.google.firebase.crashlytics") - id("com.google.firebase.firebase-perf") alias(libs.plugins.firebase.appdistribution) + alias(libs.plugins.firebase.perf) alias(libs.plugins.google.services) alias(libs.plugins.grgit) alias(libs.plugins.hilt) diff --git a/build.gradle b/build.gradle index 095548aa92..b77a4b882f 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,6 @@ buildscript { classpath libs.android.gradlePlugin classpath libs.firebase.crashlytics.gradlePlugin - classpath libs.firebase.perf.gradlePlugin classpath libs.kotlin.gradlePlugin } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ccd5239f8c..f300ef795e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -97,7 +97,6 @@ firebase-dynamic-links = "com.google.firebase:firebase-dynamic-links-ktx:21.1.0" firebase-inappmessaging = "com.google.firebase:firebase-inappmessaging-display:20.3.5" firebase-messaging = "com.google.firebase:firebase-messaging:23.2.1" firebase-perf = { module = "com.google.firebase:firebase-perf", version.ref = "firebase-perf" } -firebase-perf-gradlePlugin = "com.google.firebase:perf-plugin:1.4.2" firebase-perf-ktx = { module = "com.google.firebase:firebase-perf-ktx", version.ref = "firebase-perf" } godtoolsShared-analytics = { module = "org.cru.godtools.kotlin:analytics", version.ref = "godtoolsShared" } godtoolsShared-common = { module = "org.cru.godtools.kotlin:common", version.ref = "godtoolsShared" } @@ -217,6 +216,7 @@ test-framework = ["junit", "androidx-test-junit", "mockk", "robolectric"] [plugins] firebase-appdistribution = { id = "com.google.firebase.appdistribution", version = "4.0.0" } +firebase-perf = { id = "com.google.firebase.firebase-perf", version = "1.4.2" } google-services = { id = "com.google.gms.google-services", version = "4.4.0" } grgit = { id = "org.ajoberstar.grgit", version = "5.2.0" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger" } From 02efd7c7ca49d0d330da209cbe393352953f6add Mon Sep 17 00:00:00 2001 From: Daniel Frett Date: Mon, 18 Sep 2023 15:51:48 -0600 Subject: [PATCH 7/7] update firebase crashlytics gradle plugin to use modern plugins syntax --- app/build.gradle.kts | 2 +- build.gradle | 1 - gradle/libs.versions.toml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ded9095c13..6fbd33acc2 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,8 +1,8 @@ plugins { id("godtools.application-conventions") kotlin("kapt") - id("com.google.firebase.crashlytics") alias(libs.plugins.firebase.appdistribution) + alias(libs.plugins.firebase.crashlytics) alias(libs.plugins.firebase.perf) alias(libs.plugins.google.services) alias(libs.plugins.grgit) diff --git a/build.gradle b/build.gradle index b77a4b882f..0aaebfb8eb 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,6 @@ buildscript { classpath libs.gradleDownloadTask classpath libs.android.gradlePlugin - classpath libs.firebase.crashlytics.gradlePlugin classpath libs.kotlin.gradlePlugin } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f300ef795e..3baa2b217b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -91,7 +91,6 @@ facebook-flipper-plugins-leakcanary2 = { module = "com.facebook.flipper:flipper- facebook-flipper-plugins-network = { module = "com.facebook.flipper:flipper-network-plugin", version.ref = "facebook-flipper" } facebook-soloader = "com.facebook.soloader:soloader:0.10.5" firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics", version.ref = "firebase-crashlytics" } -firebase-crashlytics-gradlePlugin = "com.google.firebase:firebase-crashlytics-gradle:2.9.9" firebase-crashlytics-ndk = { module = "com.google.firebase:firebase-crashlytics-ndk", version.ref = "firebase-crashlytics" } firebase-dynamic-links = "com.google.firebase:firebase-dynamic-links-ktx:21.1.0" firebase-inappmessaging = "com.google.firebase:firebase-inappmessaging-display:20.3.5" @@ -216,6 +215,7 @@ test-framework = ["junit", "androidx-test-junit", "mockk", "robolectric"] [plugins] firebase-appdistribution = { id = "com.google.firebase.appdistribution", version = "4.0.0" } +firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "2.9.9" } firebase-perf = { id = "com.google.firebase.firebase-perf", version = "1.4.2" } google-services = { id = "com.google.gms.google-services", version = "4.4.0" } grgit = { id = "org.ajoberstar.grgit", version = "5.2.0" }