Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleanup #3106

Merged
merged 7 commits into from
Sep 18, 2023
Merged

cleanup #3106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2a89f35
fix code style for the version catalog
frett Sep 18, 2023
2422b42
stop using deprecated buildDir
frett Sep 18, 2023
ada5e02
Transition google-services plugin to modern mechanism of including it
frett Sep 18, 2023
ec93bb7
update google-services.json
frett Sep 18, 2023
923f512
Update the app distribution plugin to be configured in the modern plu…
frett Sep 18, 2023
2f57796
Update firebase performance plugin to utilize modern gradle plugin sy…
frett Sep 18, 2023
02efd7c
update firebase crashlytics gradle plugin to use modern plugins syntax
frett Sep 18, 2023
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
13 changes: 7 additions & 6 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
plugins {
id("godtools.application-conventions")
kotlin("kapt")
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.firebase.appdistribution)
alias(libs.plugins.firebase.crashlytics)
alias(libs.plugins.firebase.perf)
alias(libs.plugins.google.services)
alias(libs.plugins.grgit)
alias(libs.plugins.hilt)
}
Expand Down Expand Up @@ -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"
Expand Down
12 changes: 0 additions & 12 deletions app/google-services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -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": [
Expand Down
4 changes: 0 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +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.google.services.gradlePlugin
classpath libs.kotlin.gradlePlugin
}
}
Expand Down
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,23 +90,19 @@ 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" }
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" }
godtoolsShared-parser = { module = "org.cru.godtools.kotlin:parser", version.ref = "godtoolsShared" }
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" }
Expand Down Expand Up @@ -171,7 +167,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" }
Expand Down Expand Up @@ -218,6 +214,10 @@ common = ["kotlin-stdlib", "timber"]
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" }
hilt = { id = "com.google.dagger.hilt.android", version.ref = "dagger" }
ksp = { id = "com.google.devtools.ksp", version = "1.9.10-1.0.13" }
Expand Down