From 83e00f6b329239598ce436c8af0a5c8d04ca10da Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Fri, 9 Jan 2026 13:30:25 +0100 Subject: [PATCH 1/2] Fix configuration cache on local builds by applying the OSS Licenses plugin only on CI builds. Closes #2031 --- app/build.gradle.kts | 1 - .../src/main/kotlin/AndroidApplicationConventionPlugin.kt | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2f0253943..679b832f7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -22,7 +22,6 @@ plugins { alias(libs.plugins.nowinandroid.android.application.jacoco) alias(libs.plugins.nowinandroid.android.application.firebase) alias(libs.plugins.nowinandroid.hilt) - alias(libs.plugins.google.osslicenses) alias(libs.plugins.baselineprofile) alias(libs.plugins.roborazzi) alias(libs.plugins.kotlin.serialization) diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt index 9ae9888db..37da640ff 100644 --- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt @@ -33,6 +33,10 @@ class AndroidApplicationConventionPlugin : Plugin { apply(plugin = "nowinandroid.android.lint") apply(plugin = "com.dropbox.dependency-guard") + // Apply Google's OSS Licenses plugin only on CI to avoid breaking configuration cache on local builds + // https://github.com/google/play-services-plugins/issues/246 + if (providers.gradleProperty("CI").isPresent) apply(plugin = "com.google.android.gms.oss-licenses-plugin") + extensions.configure { configureKotlinAndroid(this) defaultConfig.targetSdk = 36 From 86245e2dd0c38c0ea630f42d29efadf27a99a7e4 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Fri, 9 Jan 2026 13:59:52 +0100 Subject: [PATCH 2/2] Use `environmentVariable` --- .../src/main/kotlin/AndroidApplicationConventionPlugin.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt index 37da640ff..5879aaabd 100644 --- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt @@ -35,7 +35,7 @@ class AndroidApplicationConventionPlugin : Plugin { // Apply Google's OSS Licenses plugin only on CI to avoid breaking configuration cache on local builds // https://github.com/google/play-services-plugins/issues/246 - if (providers.gradleProperty("CI").isPresent) apply(plugin = "com.google.android.gms.oss-licenses-plugin") + if (providers.environmentVariable("CI").isPresent) apply(plugin = "com.google.android.gms.oss-licenses-plugin") extensions.configure { configureKotlinAndroid(this)