Skip to content

Commit 5bdd375

Browse files
authored
Merge pull request #1014 from android/av/autofix-badging-with-correct-task-name
Use specific task name to update badging for checking badging error message
2 parents 3ccacba + c70049e commit 5bdd375

File tree

1 file changed

+11
-3
lines changed
  • build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid

1 file changed

+11
-3
lines changed

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ import org.gradle.api.GradleException
2424
import org.gradle.api.Project
2525
import org.gradle.api.file.DirectoryProperty
2626
import org.gradle.api.file.RegularFileProperty
27+
import org.gradle.api.provider.Property
2728
import org.gradle.api.tasks.Copy
29+
import org.gradle.api.tasks.Input
2830
import org.gradle.api.tasks.InputFile
2931
import org.gradle.api.tasks.OutputDirectory
3032
import org.gradle.api.tasks.OutputFile
@@ -79,6 +81,9 @@ abstract class CheckBadgingTask : DefaultTask() {
7981
@get:InputFile
8082
abstract val generatedBadging: RegularFileProperty
8183

84+
@get:Input
85+
abstract val updateBadgingTaskName: Property<String>
86+
8287
override fun getGroup(): String = LifecycleBasePlugin.VERIFICATION_GROUP
8388

8489
@TaskAction
@@ -91,7 +96,7 @@ abstract class CheckBadgingTask : DefaultTask() {
9196
) {
9297
throw GradleException(
9398
"Generated badging is different from golden badging! " +
94-
"If this change is intended, run ./gradlew updateBadging",
99+
"If this change is intended, run ./gradlew ${updateBadgingTaskName.get()}",
95100
)
96101
}
97102
}
@@ -105,8 +110,9 @@ fun Project.configureBadgingTasks(
105110
componentsExtension.onVariants { variant ->
106111
// Registers a new task to verify the app bundle.
107112
val capitalizedVariantName = variant.name.capitalized()
113+
val generateBadgingTaskName = "generate${capitalizedVariantName}Badging"
108114
val generateBadging =
109-
tasks.register<GenerateBadgingTask>("generate${capitalizedVariantName}Badging") {
115+
tasks.register<GenerateBadgingTask>(generateBadgingTaskName) {
110116
apk.set(
111117
variant.artifacts.get(SingleArtifact.APK_FROM_BUNDLE),
112118
)
@@ -124,7 +130,8 @@ fun Project.configureBadgingTasks(
124130
)
125131
}
126132

127-
tasks.register<Copy>("update${capitalizedVariantName}Badging") {
133+
val updateBadgingTaskName = "update${capitalizedVariantName}Badging"
134+
tasks.register<Copy>(updateBadgingTaskName) {
128135
from(generateBadging.get().badging)
129136
into(project.layout.projectDirectory)
130137
}
@@ -137,6 +144,7 @@ fun Project.configureBadgingTasks(
137144
generatedBadging.set(
138145
generateBadging.get().badging,
139146
)
147+
this.updateBadgingTaskName.set(updateBadgingTaskName)
140148

141149
output.set(
142150
project.layout.buildDirectory.dir("intermediates/$checkBadgingTaskName"),

0 commit comments

Comments
 (0)