A fully functional Android app built entirely with Kotlin and Jetpack Compose
Enable stricter validation for build-logic convention plugins
Alex Vanyo8a992996a4a5
diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yamlindex ca161b0a4..d47342c6a 100644--- a/.github/workflows/Build.yaml+++ b/.github/workflows/Build.yaml@@ -39,6 +39,9 @@ jobs:- name: Setup Gradleuses: gradle/gradle-build-action@v2+ - name: Check build-logic+ run: ./gradlew check -p build-logic+- name: Check spotlessrun: ./gradlew spotlessCheck --init-script gradle/init.gradle.kts --no-configuration-cachediff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.ktsindex b6650aa75..e75ed468f 100644--- a/build-logic/convention/build.gradle.kts+++ b/build-logic/convention/build.gradle.kts@@ -43,6 +43,13 @@ dependencies {compileOnly(libs.ksp.gradlePlugin)}+tasks {+ validatePlugins {+ enableStricterValidation.set(true)+ failOnWarning.set(true)+ }+}+gradlePlugin {plugins {register("androidApplicationCompose") {diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.ktindex bcaa00f9f..2a776e429 100644--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt@@ -26,11 +26,14 @@ import org.gradle.api.Projectimport org.gradle.api.file.DirectoryPropertyimport org.gradle.api.file.RegularFilePropertyimport org.gradle.api.provider.Property+import org.gradle.api.tasks.CacheableTaskimport org.gradle.api.tasks.Copyimport org.gradle.api.tasks.Inputimport org.gradle.api.tasks.InputFileimport org.gradle.api.tasks.OutputDirectoryimport org.gradle.api.tasks.OutputFile+import org.gradle.api.tasks.PathSensitive+import org.gradle.api.tasks.PathSensitivityimport org.gradle.api.tasks.TaskActionimport org.gradle.configurationcache.extensions.capitalizedimport org.gradle.kotlin.dsl.register@@ -40,14 +43,17 @@ import java.io.Fileimport java.nio.file.Filesimport javax.inject.Inject+@CacheableTaskabstract class GenerateBadgingTask : DefaultTask() {@get:OutputFileabstract val badging: RegularFileProperty+ @get:PathSensitive(PathSensitivity.NONE)@get:InputFileabstract val apk: RegularFileProperty+ @get:PathSensitive(PathSensitivity.NONE)@get:InputFileabstract val aapt2Executable: RegularFileProperty@@ -68,6 +74,7 @@ abstract class GenerateBadgingTask : DefaultTask() {}}+@CacheableTaskabstract class CheckBadgingTask : DefaultTask() {// In order for the task to be up-to-date when the inputs have not changed,@@ -76,9 +83,11 @@ abstract class CheckBadgingTask : DefaultTask() {@get:OutputDirectoryabstract val output: DirectoryProperty+ @get:PathSensitive(PathSensitivity.NONE)@get:InputFileabstract val goldenBadging: RegularFileProperty+ @get:PathSensitive(PathSensitivity.NONE)@get:InputFileabstract val generatedBadging: RegularFilePropertydiff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/PrintTestApks.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/PrintTestApks.ktindex 6c08216cc..94bf6e127 100644--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/PrintTestApks.kt+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/PrintTestApks.kt@@ -30,7 +30,10 @@ import org.gradle.api.tasks.Inputimport org.gradle.api.tasks.InputDirectoryimport org.gradle.api.tasks.InputFilesimport org.gradle.api.tasks.Internal+import org.gradle.api.tasks.PathSensitive+import org.gradle.api.tasks.PathSensitivityimport org.gradle.api.tasks.TaskAction+import org.gradle.work.DisableCachingByDefaultimport java.io.Fileinternal fun Project.configurePrintApksTask(extension: AndroidComponentsExtension<*, *, *>) {@@ -62,10 +65,14 @@ internal fun Project.configurePrintApksTask(extension: AndroidComponentsExtensio}}+@DisableCachingByDefault(because = "Prints output")internal abstract class PrintApkLocationTask : DefaultTask() {++ @get:PathSensitive(PathSensitivity.RELATIVE)@get:InputDirectoryabstract val apkFolder: DirectoryProperty+ @get:PathSensitive(PathSensitivity.RELATIVE)@get:InputFilesabstract val sources: ListProperty<Directory>