From ece377bc8d38997271080163fbe32fec353fc90d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 25 Jul 2023 17:36:49 +0000 Subject: [PATCH 1/3] Update android.gradle.plugin to v8.1.0 --- 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 e5e827c50e..2c4fdd34c8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] accompanist = "0.30.1" -android-gradle-plugin = "8.0.2" +android-gradle-plugin = "8.1.0" androidx-compose-compiler = "1.5.0" androidx-compose-material = "1.4.3" androidx-compose-ui = "1.4.3" From fbd39fbf65d50021d6e0fc4ada15237ba5ad012a Mon Sep 17 00:00:00 2001 From: Daniel Frett Date: Tue, 25 Jul 2023 12:24:42 -0600 Subject: [PATCH 2/3] fix build-logic for new version of AGP --- build-logic/src/main/kotlin/AndroidConfiguration.kt | 4 ++-- build-logic/src/main/kotlin/GodToolsCustomUriConfiguration.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-logic/src/main/kotlin/AndroidConfiguration.kt b/build-logic/src/main/kotlin/AndroidConfiguration.kt index 3514b39cde..cc65583a39 100644 --- a/build-logic/src/main/kotlin/AndroidConfiguration.kt +++ b/build-logic/src/main/kotlin/AndroidConfiguration.kt @@ -99,7 +99,7 @@ fun BaseExtension.configureFlavorDimensions(project: Project) { // TODO: provide Project using the new multiple context receivers functionality. // this is prototyped in 1.6.20 and will probably reach beta in Kotlin 1.8 or 1.9 //context(Project) -fun CommonExtension<*, *, *, *>.configureCompose(project: Project) { +fun CommonExtension<*, *, *, *, *>.configureCompose(project: Project) { buildFeatures.compose = true composeOptions.kotlinCompilerExtensionVersion = project.libs.findVersion("androidx-compose-compiler").get().requiredVersion @@ -115,7 +115,7 @@ fun CommonExtension<*, *, *, *>.configureCompose(project: Project) { // TODO: provide Project using the new multiple context receivers functionality. // this is prototyped in 1.6.20 and will probably reach beta in Kotlin 1.8 or 1.9 //context(Project) -fun CommonExtension<*, *, *, *>.configureQaBuildType(project: Project) { +fun CommonExtension<*, *, *, *, *>.configureQaBuildType(project: Project) { buildTypes { register(BUILD_TYPE_QA) { initWith(getByName(BUILD_TYPE_DEBUG)) diff --git a/build-logic/src/main/kotlin/GodToolsCustomUriConfiguration.kt b/build-logic/src/main/kotlin/GodToolsCustomUriConfiguration.kt index a7735bdd30..eef66a012d 100644 --- a/build-logic/src/main/kotlin/GodToolsCustomUriConfiguration.kt +++ b/build-logic/src/main/kotlin/GodToolsCustomUriConfiguration.kt @@ -4,7 +4,7 @@ import com.android.build.api.dsl.VariantDimension private const val BUILD_CONFIG_FIELD_HOST = "HOST_GODTOOLS_CUSTOM_URI" private const val PLACEHOLDER_HOST = "hostGodtoolsCustomUri" -fun CommonExtension<*, *, *, *>.configureGodToolsCustomUri() { +fun CommonExtension<*, *, *, *, *>.configureGodToolsCustomUri() { buildFeatures.buildConfig = true buildTypes { named("debug") { From 507f4b583523e10c9c9754537095773ba7ff43d4 Mon Sep 17 00:00:00 2001 From: Daniel Frett Date: Tue, 25 Jul 2023 12:24:57 -0600 Subject: [PATCH 3/3] we no longer need to use a custom version of lint --- gradle.properties | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6ea105024b..2e6ceefa00 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,3 @@ firebaseAppDistributionKeystorePath=firebase/app_distribution.keystore firebaseAppDistributionKeystoreStorePassword= firebaseAppDistributionKeystoreKeyAlias=godtools firebaseAppDistributionKeystoreKeyPassword= - -# Customise the Lint version to use a more recent version than the one bundled with AGP -# https://googlesamples.github.io/android-custom-lint-rules/usage/newer-lint.md.html -android.experimental.lint.version=8.1.0-rc01