Polish API

natario1 · natario1 · commit e5503848eb82 · 2024-08-25T19:57:07.000+02:00
diff --git a/grease/src/main/kotlin/io/deepmedia/tools/grease/GreaseExtension.kt b/grease/src/main/kotlin/io/deepmedia/tools/grease/GreaseExtension.kt
@@ -3,35 +3,31 @@ package io.deepmedia.tools.grease
 import com.github.jengelman.gradle.plugins.shadow.relocation.Relocator
 import com.github.jengelman.gradle.plugins.shadow.relocation.SimpleRelocator
 import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
+import org.gradle.api.Action
+import org.gradle.api.model.ObjectFactory
+import org.gradle.kotlin.dsl.listProperty
+import org.gradle.kotlin.dsl.newInstance
+import org.gradle.kotlin.dsl.property
+import javax.inject.Inject
 
-abstract class GreaseExtension {
+abstract class GreaseExtension @Inject constructor(objects: ObjectFactory) {
 
-    internal val relocators = mutableListOf<Relocator>()
-    internal val transformers = mutableListOf<Transformer>()
+    internal val prefix = objects.property<String>().convention("")
+    internal val relocators = objects.listProperty<Relocator>()
+    internal val transformers = objects.listProperty<Transformer>()
 
-    internal var isRelocationEnabled = false
-    var relocationPrefix: String = "shadow"
-        set(value) {
-            field = value
-            isRelocationEnabled = true
-        }
+    fun relocate(prefix: String = "grease") {
+        this.prefix.set(prefix)
+    }
 
-    fun relocate(
-        from: String,
-        to: String,
-        configure: (SimpleRelocator.() -> Unit)? = null
-    ) {
+    fun relocate(from: String, to: String, configure: Action<SimpleRelocator> = Action {  }) {
         val relocator = SimpleRelocator(from, to, emptyList(), emptyList())
-        configure?.invoke(relocator)
+        configure.execute(relocator)
         relocators.add(relocator)
     }
 
-    fun <T : Transformer> transform(
-        transformer: T,
-        configure: (T.() -> Unit)? = null
-    ) {
-        configure?.invoke(transformer)
+    fun <T : Transformer> transform(transformer: T, configure: Action<T> = Action { }) {
+        configure.execute(transformer)
         transformers.add(transformer)
     }
-
 }
diff --git a/grease/src/main/kotlin/io/deepmedia/tools/grease/GreasePlugin.kt b/grease/src/main/kotlin/io/deepmedia/tools/grease/GreasePlugin.kt
@@ -481,27 +481,28 @@ open class GreasePlugin : Plugin<Project> {
                     }
                 }
 
-                if (greaseExtension.isRelocationEnabled) {
+                val relocationPrefix = greaseExtension.prefix.get()
+                if (relocationPrefix.isNotEmpty()) {
                     greaseProcessTask.get().outputs.files
                         .asSequence()
                         .flatMap { inputFile -> inputFile.packageNames }
                         .distinct()
                         .forEach { packageName ->
-                            val newPackageName = "${greaseExtension.relocationPrefix}.$packageName"
+                            val newPackageName = "${relocationPrefix}.$packageName"
                             log.d { "Relocate package from $packageName to $newPackageName" }
                             relocate(packageName, newPackageName)
                             packagesToReplace[packageName] = newPackageName
                         }
+                }
 
-                    greaseExtension.relocators.forEach { relocator ->
-                        relocate(relocator)
-                        if (relocator is SimpleRelocator) {
-                            packagesToReplace[relocator.pattern] = relocator.shadedPattern
-                        }
+                greaseExtension.relocators.get().forEach { relocator ->
+                    relocate(relocator)
+                    if (relocator is SimpleRelocator) {
+                        packagesToReplace[relocator.pattern] = relocator.shadedPattern
                     }
-                    greaseExtension.transformers.forEach(::transform)
-
                 }
+
+                greaseExtension.transformers.get().forEach(::transform)
             }
 
             doLast {
diff --git a/tests/sample-library/build.gradle.kts b/tests/sample-library/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 grease {
-    relocationPrefix = "temp"
+    relocate()
 }
 
 android {

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`grease {`
`7`		`- relocationPrefix = "temp"`
	`7`	`+ relocate()`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`android {`