Merge pull request #15 from 2BAB/dev

Upgrade Polyfill to 0.5.0 with new `variant.artifactsPolyfill.*` API

.github/workflows/ci.yml

@@ -74,7 +74,7 @@ jobs:
       AGP_VERSION: ${{ matrix.agp-version }}
     strategy:
       matrix:
-        agp-version: [ 7.0.3, 7.1.0-beta04 ]
+        agp-version: [ 7.1.2, 7.2.0-beta04 ]
 
     steps:
       - uses: actions/checkout@v2

deps.versions.toml

@@ -1,15 +1,15 @@
 [versions]
-kotlinVer = "1.5.31"
-agpVer = "7.0.3"
-polyfillVer = "0.4.0"
+kotlinVer = "1.6.10"
+agpVer = "7.1.2"
+polyfillVer = "0.5.0"
 mockitoVer = "3.9.0"
 
 [libraries]
 android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agpVer" }
 kotlin-std = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlinVer" }
 kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core-jvm", version = "1.3.1" }
 polyfill-main = { module = "me.2bab:polyfill", version.ref = "polyfillVer" }
-polyfill-manifest = { module = "me.2bab:polyfill-manifest", version.ref = "polyfillVer" }
+polyfill-manifest = { module = "me.2bab:android-manifest-parser", version.ref = "polyfillVer" }
 fastJson = { module = "com.alibaba:fastjson", version = "1.2.73" }
 zip4j = { module = "net.lingala.zip4j:zip4j", version = "2.6.2" }
 junit = { module = "junit:junit", version = "4.12" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

publish_to_local.sh

@@ -1 +1 @@
-./gradlew clean :seal:plugin:assemble :seal:plugin:publishToMavenLocal
+./gradlew clean :seal:plugin:assemble :seal:plugin:publishSealPluginPublicationToMavenLocal

seal/buildSrc/src/main/kotlin/BuildConfig.kt

@@ -1,7 +1,7 @@
 object BuildConfig {
 
     object Versions {
-        const val sealVersion = "3.1.0"
+        const val sealVersion = "3.2.0"
     }
 
 }

seal/plugin/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("jvm")
+    `kotlin-dsl`
     kotlin("plugin.serialization")
     id("java-gradle-plugin")
     `github-release`

seal/plugin/src/main/kotlin/me/xx2bab/seal/ManifestBeforeMergeTask.kt

@@ -6,6 +6,8 @@ import me.xx2bab.seal.dom.PreciseProcessor
 import org.gradle.api.DefaultTask
 import org.gradle.api.artifacts.ArtifactCollection
 import org.gradle.api.file.FileSystemLocation
+import org.gradle.api.file.RegularFile
+import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.provider.SetProperty
@@ -17,7 +19,7 @@ abstract class ManifestBeforeMergeTask : DefaultTask() {
     abstract val rules: SetProperty<SealRule>
 
     @get:InputFiles
-    abstract val beforeMergeInputs: SetProperty<FileSystemLocation>
+    abstract val beforeMergeInputs: ListProperty<RegularFile>
 
     @TaskAction
     fun beforeMerge() {

seal/plugin/src/main/kotlin/me/xx2bab/seal/SealPlugin.kt

@@ -1,44 +1,45 @@
 package me.xx2bab.seal
 
-import com.android.build.api.variant.AndroidComponentsExtension
-import me.xx2bab.polyfill.ApplicationVariantPolyfill
-import me.xx2bab.polyfill.manifest.source.ManifestBeforeMergeAction
-import me.xx2bab.polyfill.manifest.source.ManifestMergeInputProvider
 import com.android.build.api.artifact.SingleArtifact
+import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.create
+import org.gradle.kotlin.dsl.register
+import me.xx2bab.polyfill.*
 
 class SealPlugin : Plugin<Project> {
 
     override fun apply(project: Project) {
-        val extension = project.extensions.create("seal", SealExtension::class.java)
-        val androidExtension = project.extensions.findByType(AndroidComponentsExtension::class.java)!!
+        project.apply(plugin = "me.2bab.polyfill")
+        val extension = project.extensions.create<SealExtension>("seal")
+        val androidExtension =
+            project.extensions.findByType(ApplicationAndroidComponentsExtension::class.java)!!
 
         androidExtension.onVariants { variant ->
-            val polyfill = ApplicationVariantPolyfill(project, variant)
-
             // Before merge
-            val preUpdateTask = project.tasks.register(
+            val preUpdateTask = project.tasks.register<ManifestBeforeMergeTask>(
                 "preUpdate${variant.name.capitalize()}Manifest",
-                ManifestBeforeMergeTask::class.java
             ) {
-                it.rules.set(extension.rules)
-                it.beforeMergeInputs.set(polyfill.newProvider(ManifestMergeInputProvider::class.java).obtain())
+                rules.set(extension.rules)
             }
-            val beforeMergeAction = ManifestBeforeMergeAction(preUpdateTask)
-            polyfill.addAGPTaskAction(beforeMergeAction)
+            variant.artifactsPolyfill.use(
+                taskProvider = preUpdateTask,
+                wiredWith = ManifestBeforeMergeTask::beforeMergeInputs,
+                toInPlaceUpdate = PolyfilledMultipleArtifact.ALL_MANIFESTS
+            )
 
             // After merge
-            val postUpdateTask = project.tasks.register(
-                "postUpdate${variant.name.capitalize()}Manifest",
-                ManifestAfterMergeTask::class.java
+            val postUpdateTask = project.tasks.register<ManifestAfterMergeTask>(
+                "postUpdate${variant.name.capitalize()}Manifest"
             ) {
-                it.rules.set(extension.rules)
+                rules.set(extension.rules)
             }
-            variant.artifacts.use(postUpdateTask).wiredWithFiles(
-                ManifestAfterMergeTask::mergedManifest,
-                ManifestAfterMergeTask::updatedManifest
-            ).toTransform(SingleArtifact.MERGED_MANIFEST)
+            variant.artifacts.use(postUpdateTask)
+                .wiredWithFiles(ManifestAfterMergeTask::mergedManifest,
+                    ManifestAfterMergeTask::updatedManifest)
+                .toTransform(SingleArtifact.MERGED_MANIFEST)
         }
     }
 

test-app/build.gradle.kts

@@ -103,8 +103,3 @@ seal {
 //        .deleteAttr()
 
 }
-project.tasks.whenTaskAdded {
-    if (this is com.android.build.gradle.tasks.ProcessMultiApkApplicationManifest) {
-        println("detected ProcessMultiApkApplicationManifest")
-    }
-}

test-library/build.gradle.kts

@@ -13,7 +13,7 @@ android {
     }
 
     lint {
-        isAbortOnError = false
+//        isAbortOnError = false
     }
 
     sourceSets["main"].java.srcDir("src/main/kotlin")