@@ -9,7 +9,6 @@ import com.android.build.gradle.internal.LibraryTaskManager
9
9
import com.android.build.gradle.internal.LoggerWrapper
10
10
import com.android.build.gradle.internal.TaskManager
11
11
import com.android.build.gradle.internal.component.ComponentCreationConfig
12
- import com.android.build.gradle.internal.manifest.parseManifest
13
12
import com.android.build.gradle.internal.publishing.AndroidArtifacts
14
13
import com.android.build.gradle.internal.res.GenerateLibraryRFileTask
15
14
import com.android.build.gradle.internal.res.ParseLibraryResourcesTask
@@ -23,11 +22,11 @@ import com.android.build.gradle.internal.tasks.manifest.mergeManifests
23
22
import com.android.build.gradle.tasks.BundleAar
24
23
import com.android.build.gradle.tasks.MergeResources
25
24
import com.android.build.gradle.tasks.ProcessLibraryManifest
26
- import com.android.builder.errors.DefaultIssueReporter
27
25
import com.android.ide.common.resources.CopyToOutputDirectoryResourceCompilationService
26
+ import com.android.ide.common.symbols.parseManifest
28
27
import com.android.manifmerger.ManifestMerger2
29
28
import com.android.manifmerger.ManifestProvider
30
- import com.android.utils.StdLogger
29
+ import com.android.utils.appendCapitalized
31
30
import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator
32
31
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
33
32
import org.gradle.api.Plugin
@@ -50,8 +49,6 @@ import java.io.File
50
49
*/
51
50
open class GreasePlugin : Plugin <Project > {
52
51
53
- private val defaultIssueReporter = DefaultIssueReporter (StdLogger (StdLogger .Level .WARNING ))
54
-
55
52
override fun apply (target : Project ) {
56
53
target.plugins.withId(" com.android.library" ) {
57
54
val log = Logger (target, " grease" )
@@ -469,8 +466,8 @@ open class GreasePlugin : Plugin<Project> {
469
466
470
467
log.d { " Executing shadowing for variant ${variant.name} and ${extraManifests.files.size} roots with namespace ${variant.namespace.get()} ..." }
471
468
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 ->
474
471
log.d { " Processing R class from $fromPackageName manifestInput=${inputFile.path} outputDir=${compileTask.get().destinationDirectory.get()} ..." }
475
472
relocate(RClassRelocator (fromPackageName, variant.namespace.get(), log))
476
473
}
@@ -664,6 +661,9 @@ open class GreasePlugin : Plugin<Project> {
664
661
}
665
662
}
666
663
664
+ private fun ComponentCreationConfig.computeTaskName (prefix : String , suffix : String ): String =
665
+ prefix.appendCapitalized(name, suffix)
666
+
667
667
private fun Variant.componentCreationConfigOrThrow (): ComponentCreationConfig {
668
668
return when (this ) {
669
669
is ComponentCreationConfig -> this
0 commit comments