Skip to content

Commit f11d3cf

Browse files
authored
support binary compatibility with agp 8.6 (#10)
1 parent d05bf3e commit f11d3cf

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import com.android.build.gradle.internal.LibraryTaskManager
99
import com.android.build.gradle.internal.LoggerWrapper
1010
import com.android.build.gradle.internal.TaskManager
1111
import com.android.build.gradle.internal.component.ComponentCreationConfig
12-
import com.android.build.gradle.internal.manifest.parseManifest
1312
import com.android.build.gradle.internal.publishing.AndroidArtifacts
1413
import com.android.build.gradle.internal.res.GenerateLibraryRFileTask
1514
import com.android.build.gradle.internal.res.ParseLibraryResourcesTask
@@ -23,11 +22,11 @@ import com.android.build.gradle.internal.tasks.manifest.mergeManifests
2322
import com.android.build.gradle.tasks.BundleAar
2423
import com.android.build.gradle.tasks.MergeResources
2524
import com.android.build.gradle.tasks.ProcessLibraryManifest
26-
import com.android.builder.errors.DefaultIssueReporter
2725
import com.android.ide.common.resources.CopyToOutputDirectoryResourceCompilationService
26+
import com.android.ide.common.symbols.parseManifest
2827
import com.android.manifmerger.ManifestMerger2
2928
import com.android.manifmerger.ManifestProvider
30-
import com.android.utils.StdLogger
29+
import com.android.utils.appendCapitalized
3130
import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator
3231
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
3332
import org.gradle.api.Plugin
@@ -50,8 +49,6 @@ import java.io.File
5049
*/
5150
open class GreasePlugin : Plugin<Project> {
5251

53-
private val defaultIssueReporter = DefaultIssueReporter(StdLogger(StdLogger.Level.WARNING))
54-
5552
override fun apply(target: Project) {
5653
target.plugins.withId("com.android.library") {
5754
val log = Logger(target, "grease")
@@ -469,8 +466,8 @@ open class GreasePlugin : Plugin<Project> {
469466

470467
log.d { "Executing shadowing for variant ${variant.name} and ${extraManifests.files.size} roots with namespace ${variant.namespace.get()}..." }
471468
extraManifests.forEach { inputFile ->
472-
val manifestData = parseManifest(inputFile, true, { true }, defaultIssueReporter)
473-
manifestData.packageName?.let { fromPackageName ->
469+
val manifestData = parseManifest(inputFile)
470+
manifestData.`package`?.let { fromPackageName ->
474471
log.d { "Processing R class from $fromPackageName manifestInput=${inputFile.path} outputDir=${compileTask.get().destinationDirectory.get()}..." }
475472
relocate(RClassRelocator(fromPackageName, variant.namespace.get(), log))
476473
}
@@ -664,6 +661,9 @@ open class GreasePlugin : Plugin<Project> {
664661
}
665662
}
666663

664+
private fun ComponentCreationConfig.computeTaskName(prefix: String, suffix: String): String =
665+
prefix.appendCapitalized(name, suffix)
666+
667667
private fun Variant.componentCreationConfigOrThrow(): ComponentCreationConfig {
668668
return when (this) {
669669
is ComponentCreationConfig -> this

0 commit comments

Comments
 (0)