Tweaks

Author: Goooler

api/shadow.api

@@ -464,10 +464,8 @@ public class com/github/jengelman/gradle/plugins/shadow/transformers/ProGuardTra
 	public fun <init> ()V
 	public fun <init> (Lorg/gradle/api/tasks/util/PatternSet;)V
 	public synthetic fun <init> (Lorg/gradle/api/tasks/util/PatternSet;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
-	public fun getPath ()Ljava/lang/String;
 	public fun hasTransformedResource ()Z
 	public fun modifyOutputStream (Lorg/apache/tools/zip/ZipOutputStream;Z)V
-	public fun setPath (Ljava/lang/String;)V
 	public fun transform (Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext;)V
 }
 

src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ProGuardTransformer.kt

@@ -19,14 +19,6 @@ constructor(patternSet: PatternSet = PatternSet().include(PROGUARD_PATTERN)) :
   PatternFilterableResourceTransformer(patternSet = patternSet) {
   @get:Internal internal val proGuardEntries = mutableMapOf<String, MutableList<String>>()
 
-  @get:Internal // No need to mark this as an input as `getIncludes` is already marked as `@Input`.
-  public open var path: String = PROGUARD_PATH
-    set(value) {
-      field = value
-      // Reset the includes to match the new path.
-      setIncludes(listOf("$value/**"))
-    }
-
   override fun transform(context: TransformerContext) {
     val lines = proGuardEntries.getOrPut(context.path) { mutableListOf() }
     context.inputStream.bufferedReader().use { it.readLines() }.forEach { line -> lines.add(line) }
@@ -37,13 +29,12 @@ constructor(patternSet: PatternSet = PatternSet().include(PROGUARD_PATTERN)) :
   override fun modifyOutputStream(os: ZipOutputStream, preserveFileTimestamps: Boolean) {
     proGuardEntries.forEach { (path, lines) ->
       os.putNextEntry(zipEntry(path, preserveFileTimestamps))
-      os.write(lines.joinToString("\n").toByteArray())
+      os.write(lines.joinToString(System.lineSeparator()).toByteArray())
       os.closeEntry()
     }
   }
 
   private companion object {
-    private const val PROGUARD_PATH = "META-INF/proguard"
-    private const val PROGUARD_PATTERN = "$PROGUARD_PATH/**"
+    private const val PROGUARD_PATTERN = "META-INF/proguard/**"
   }
 }

src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/ProGuardTransformerTest.kt

@@ -2,7 +2,6 @@ package com.github.jengelman.gradle.plugins.shadow.transformers
 
 import assertk.assertThat
 import assertk.assertions.isEqualTo
-import assertk.assertions.isFalse
 import assertk.assertions.isTrue
 import com.github.jengelman.gradle.plugins.shadow.testkit.JarPath
 import com.github.jengelman.gradle.plugins.shadow.testkit.getContent
@@ -71,9 +70,9 @@ class ProGuardTransformerTest : BaseTransformerTest<ProGuardTransformer>() {
 
   @Test
   fun canTransformAlternatePath() {
-    transformer.path = "META-INF/custom"
+    transformer.include("META-INF/custom")
+    assertThat(transformer.canTransformResource("META-INF/proguard/rules.pro")).isTrue()
     assertThat(transformer.canTransformResource("META-INF/custom/rules.pro")).isTrue()
-    assertThat(transformer.canTransformResource("META-INF/proguard/rules.pro")).isFalse()
   }
 
   private companion object {