Skip to content

Commit c081400

Browse files
authored
Attempt to fix binary compatibility issue with agp 8.6 (#12)
1 parent 06c0b60 commit c081400

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

grease/src/main/kotlin/io/deepmedia/tools/grease/GreasePlugin.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ open class GreasePlugin : Plugin<Project> {
118118

119119
val componentConfig = variant.componentCreationConfigOrThrow()
120120

121-
target.locateTask(componentConfig.computeTaskName("process", "Manifest"))?.configure {
121+
target.locateTask(componentConfig.resolveTaskName("process", "Manifest"))?.configure {
122122
val processManifestTask = this as ProcessLibraryManifest
123123

124124
val extraManifests = configurations.artifactsOf(AndroidArtifacts.ArtifactType.MANIFEST)
@@ -218,7 +218,7 @@ open class GreasePlugin : Plugin<Project> {
218218

219219
val creationConfig = variant.componentCreationConfigOrThrow()
220220

221-
target.locateTask(creationConfig.computeTaskName("copy", "JniLibsProjectAndLocalJars"))?.configure {
221+
target.locateTask(creationConfig.resolveTaskName("copy", "JniLibsProjectAndLocalJars"))?.configure {
222222
val copyJniTask = this as LibraryJniLibsTask
223223
val extraJniLibs = configurations.artifactsOf(AndroidArtifacts.ArtifactType.JNI)
224224
dependsOn(extraJniLibs)
@@ -315,7 +315,7 @@ open class GreasePlugin : Plugin<Project> {
315315
log.d { "Configuring variant ${variant.name}..." }
316316
val creationConfig = variant.componentCreationConfigOrThrow()
317317

318-
target.locateTask(creationConfig.computeTaskName("package", "Resources"))?.configure {
318+
target.locateTask(creationConfig.resolveTaskName("package", "Resources"))?.configure {
319319
this as MergeResources
320320

321321
val resourcesMergingWorkdir = target.greaseBuildDir.get().dir(variant.name).dir("resources")
@@ -393,7 +393,7 @@ open class GreasePlugin : Plugin<Project> {
393393
val bundleLibraryTask = creationConfig.taskContainer.bundleLibraryTask
394394

395395
val greaseExpandTask = target.tasks.locateOrRegisterTask(
396-
creationConfig.computeTaskName("extract", "Aar").greasify(),
396+
creationConfig.resolveTaskName("extract", "Aar").greasify(),
397397
) {
398398
val bundleAar = bundleLibraryTask?.get() as BundleAar
399399

@@ -409,7 +409,7 @@ open class GreasePlugin : Plugin<Project> {
409409
}
410410

411411
val greaseProcessTask = target.tasks.locateOrRegisterTask(
412-
creationConfig.computeTaskName("process", "Jar").greasify(),
412+
creationConfig.resolveTaskName("process", "Jar").greasify(),
413413
) {
414414

415415
// There are many options here. PROCESSED_JAR, PROCESSED_AAR, CLASSES, CLASSES_JAR ...
@@ -440,7 +440,7 @@ open class GreasePlugin : Plugin<Project> {
440440
}
441441

442442
val greaseShadowTask = target.tasks.locateOrRegisterTask(
443-
creationConfig.computeTaskName("shadow", "Aar").greasify(),
443+
creationConfig.resolveTaskName("shadow", "Aar").greasify(),
444444
ShadowJar::class.java
445445
) {
446446
val compileTask = creationConfig.taskContainer.javacTask
@@ -645,7 +645,7 @@ open class GreasePlugin : Plugin<Project> {
645645
val log = logger.child("configureVariantProguardFiles")
646646
log.d { "Configuring variant ${variant.name}..." }
647647
val creationConfig = variant.componentCreationConfigOrThrow()
648-
target.locateTask(creationConfig.computeTaskName("merge", "ConsumerProguardFiles"))?.configure {
648+
target.locateTask(creationConfig.resolveTaskName("merge", "ConsumerProguardFiles"))?.configure {
649649
val mergeFileTask = this as MergeFileTask
650650
// UNFILTERED_PROGUARD_RULES, FILTERED_PROGUARD_RULES, AAPT_PROGUARD_RULES, ...
651651
// UNFILTERED_PROGUARD_RULES is output of the AarTransform. FILTERED_PROGUARD_RULES
@@ -661,7 +661,7 @@ open class GreasePlugin : Plugin<Project> {
661661
}
662662
}
663663

664-
private fun ComponentCreationConfig.computeTaskName(prefix: String, suffix: String): String =
664+
private fun ComponentCreationConfig.resolveTaskName(prefix: String, suffix: String): String =
665665
prefix.appendCapitalized(name, suffix)
666666

667667
private fun Variant.componentCreationConfigOrThrow(): ComponentCreationConfig {

0 commit comments

Comments
 (0)