A fully functional Android app built entirely with Kotlin and Jetpack Compose
Change set to `=` operator
Jaehwa Noh249d784ea132
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 c59d3ffb8..4447b8602 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@@ -16,10 +16,10 @@package com.google.samples.apps.nowinandroid+import com.android.SdkConstantsimport com.android.build.api.artifact.SingleArtifactimport com.android.build.api.variant.ApplicationAndroidComponentsExtensionimport com.android.build.gradle.BaseExtension-import com.android.SdkConstantsimport com.google.common.truth.Truth.assertWithMessageimport org.gradle.api.DefaultTaskimport org.gradle.api.Project@@ -36,6 +36,7 @@ import org.gradle.api.tasks.PathSensitiveimport org.gradle.api.tasks.PathSensitivityimport org.gradle.api.tasks.TaskActionimport org.gradle.configurationcache.extensions.capitalized+import org.gradle.kotlin.dsl.assignimport org.gradle.kotlin.dsl.registerimport org.gradle.language.base.plugins.LifecycleBasePluginimport org.gradle.process.ExecOperations@@ -117,23 +118,20 @@ fun Project.configureBadgingTasks(val generateBadgingTaskName = "generate${capitalizedVariantName}Badging"val generateBadging =tasks.register<GenerateBadgingTask>(generateBadgingTaskName) {- apk.set(- variant.artifacts.get(SingleArtifact.APK_FROM_BUNDLE),- )- aapt2Executable.set(- File(- baseExtension.sdkDirectory,- "${SdkConstants.FD_BUILD_TOOLS}/" +- "${baseExtension.buildToolsVersion}/" +- SdkConstants.FN_AAPT2,- ),+ apk = variant.artifacts.get(SingleArtifact.APK_FROM_BUNDLE)++ aapt2Executable = File(+ baseExtension.sdkDirectory,+ "${SdkConstants.FD_BUILD_TOOLS}/" ++ "${baseExtension.buildToolsVersion}/" ++ SdkConstants.FN_AAPT2,)- badging.set(- project.layout.buildDirectory.file(- "outputs/apk_from_bundle/${variant.name}/${variant.name}-badging.txt",- ),++ badging = project.layout.buildDirectory.file(+ "outputs/apk_from_bundle/${variant.name}/${variant.name}-badging.txt",)+}val updateBadgingTaskName = "update${capitalizedVariantName}Badging"@@ -144,17 +142,14 @@ fun Project.configureBadgingTasks(val checkBadgingTaskName = "check${capitalizedVariantName}Badging"tasks.register<CheckBadgingTask>(checkBadgingTaskName) {- goldenBadging.set(- project.layout.projectDirectory.file("${variant.name}-badging.txt"),- )- generatedBadging.set(- generateBadging.get().badging,- )- this.updateBadgingTaskName.set(updateBadgingTaskName)+ goldenBadging = project.layout.projectDirectory.file("${variant.name}-badging.txt")++ generatedBadging = generateBadging.get().badging++ this.updateBadgingTaskName = updateBadgingTaskName++ output = project.layout.buildDirectory.dir("intermediates/$checkBadgingTaskName")- output.set(- project.layout.buildDirectory.dir("intermediates/$checkBadgingTaskName"),- )}}}diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.ktindex 7820a978e..78f2b2bfe 100644--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt@@ -24,6 +24,7 @@ import org.gradle.api.file.Directoryimport org.gradle.api.file.RegularFileimport org.gradle.api.provider.ListPropertyimport org.gradle.api.tasks.testing.Test+import org.gradle.kotlin.dsl.assignimport org.gradle.kotlin.dsl.configureimport org.gradle.kotlin.dsl.registerimport org.gradle.kotlin.dsl.withType@@ -79,8 +80,8 @@ internal fun Project.configureJacoco(})reports {- xml.required.set(true)- html.required.set(true)+ xml.required = true+ html.required = true}// TODO: This is missing files in src/debug/, src/prod, src/demo, src/demoDebug...diff --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 8e88f5a53..0b0eb8f4c 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@@ -33,6 +33,7 @@ import org.gradle.api.tasks.Internalimport org.gradle.api.tasks.PathSensitiveimport org.gradle.api.tasks.PathSensitivityimport org.gradle.api.tasks.TaskAction+import org.gradle.kotlin.dsl.assignimport org.gradle.work.DisableCachingByDefaultimport java.io.File@@ -55,10 +56,10 @@ internal fun Project.configurePrintApksTask(extension: AndroidComponentsExtensio"${variant.name}PrintTestApk",PrintApkLocationTask::class.java) {- apkFolder.set(artifact)- builtArtifactsLoader.set(loader)- variantName.set(variant.name)- sources.set(testSources)+ apkFolder = artifact+ builtArtifactsLoader = loader+ variantName = variant.name+ sources = testSources}}}@@ -100,4 +101,4 @@ internal abstract class PrintApkLocationTask : DefaultTask() {val apk = File(builtArtifacts.elements.single().outputFile).toPath()println(apk)}-}\ No newline at end of file+}diff --git a/settings.gradle.kts b/settings.gradle.ktsindex d4b6654b1..c90c1a24a 100644--- a/settings.gradle.kts+++ b/settings.gradle.kts@@ -24,7 +24,7 @@ pluginManagement {}dependencyResolutionManagement {- repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)+ repositoriesMode = RepositoriesMode.FAIL_ON_PROJECT_REPOSrepositories {google()mavenCentral()@@ -63,4 +63,3 @@ include(":lint")include(":sync:work")include(":sync:sync-test")include(":ui-test-hilt-manifest")-