Skip to content

Commit dcb6620

Browse files
authored
Public const values of GroovyExtensionModuleTransformer (#1129)
1 parent 7500787 commit dcb6620

File tree

2 files changed

+22
-18
lines changed

2 files changed

+22
-18
lines changed

api/shadow.api

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,13 +434,25 @@ public class com/github/jengelman/gradle/plugins/shadow/transformers/DontInclude
434434
}
435435

436436
public class com/github/jengelman/gradle/plugins/shadow/transformers/GroovyExtensionModuleTransformer : com/github/jengelman/gradle/plugins/shadow/transformers/Transformer {
437+
public static final field Companion Lcom/github/jengelman/gradle/plugins/shadow/transformers/GroovyExtensionModuleTransformer$Companion;
438+
public static final field EXTENSION_CLASSES_KEY Ljava/lang/String;
439+
public static final field GROOVY_EXTENSION_MODULE_DESCRIPTOR_PATH Ljava/lang/String;
440+
public static final field GROOVY_LEGACY_EXTENSION_MODULE_DESCRIPTOR_PATH Ljava/lang/String;
441+
public static final field MERGED_MODULE_NAME Ljava/lang/String;
442+
public static final field MERGED_MODULE_VERSION Ljava/lang/String;
443+
public static final field MODULE_NAME_KEY Ljava/lang/String;
444+
public static final field MODULE_VERSION_KEY Ljava/lang/String;
445+
public static final field STATIC_EXTENSION_CLASSES_KEY Ljava/lang/String;
437446
public fun <init> ()V
438447
public fun canTransformResource (Lorg/gradle/api/file/FileTreeElement;)Z
439448
public fun hasTransformedResource ()Z
440449
public fun modifyOutputStream (Lorg/apache/tools/zip/ZipOutputStream;Z)V
441450
public fun transform (Lcom/github/jengelman/gradle/plugins/shadow/transformers/TransformerContext;)V
442451
}
443452

453+
public final class com/github/jengelman/gradle/plugins/shadow/transformers/GroovyExtensionModuleTransformer$Companion {
454+
}
455+
444456
public class com/github/jengelman/gradle/plugins/shadow/transformers/IncludeResourceTransformer : com/github/jengelman/gradle/plugins/shadow/transformers/Transformer {
445457
public fun <init> (Lorg/gradle/api/model/ObjectFactory;)V
446458
public fun canTransformResource (Lorg/gradle/api/file/FileTreeElement;)Z

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

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package com.github.jengelman.gradle.plugins.shadow.transformers
22

3+
import com.github.jengelman.gradle.plugins.shadow.internal.inputStream
34
import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext.Companion.getEntryTimestamp
4-
import java.io.ByteArrayInputStream
5-
import java.io.ByteArrayOutputStream
6-
import java.io.InputStream
75
import java.util.Properties
86
import org.apache.tools.zip.ZipEntry
97
import org.apache.tools.zip.ZipOutputStream
@@ -88,22 +86,16 @@ public open class GroovyExtensionModuleTransformer : Transformer {
8886
os.closeEntry()
8987
}
9088

91-
private companion object {
92-
private fun Properties.inputStream(): InputStream {
93-
val os = ByteArrayOutputStream()
94-
store(os, null)
95-
return ByteArrayInputStream(os.toByteArray())
96-
}
97-
98-
private const val GROOVY_LEGACY_EXTENSION_MODULE_DESCRIPTOR_PATH =
89+
public companion object {
90+
public const val GROOVY_LEGACY_EXTENSION_MODULE_DESCRIPTOR_PATH: String =
9991
"META-INF/services/org.codehaus.groovy.runtime.ExtensionModule"
100-
private const val GROOVY_EXTENSION_MODULE_DESCRIPTOR_PATH =
92+
public const val GROOVY_EXTENSION_MODULE_DESCRIPTOR_PATH: String =
10193
"META-INF/groovy/org.codehaus.groovy.runtime.ExtensionModule"
102-
private const val MODULE_NAME_KEY = "moduleName"
103-
private const val MODULE_VERSION_KEY = "moduleVersion"
104-
private const val EXTENSION_CLASSES_KEY = "extensionClasses"
105-
private const val STATIC_EXTENSION_CLASSES_KEY = "staticExtensionClasses"
106-
private const val MERGED_MODULE_NAME = "MergedByShadowJar"
107-
private const val MERGED_MODULE_VERSION = "1.0.0"
94+
public const val MODULE_NAME_KEY: String = "moduleName"
95+
public const val MODULE_VERSION_KEY: String = "moduleVersion"
96+
public const val EXTENSION_CLASSES_KEY: String = "extensionClasses"
97+
public const val STATIC_EXTENSION_CLASSES_KEY: String = "staticExtensionClasses"
98+
public const val MERGED_MODULE_NAME: String = "MergedByShadowJar"
99+
public const val MERGED_MODULE_VERSION: String = "1.0.0"
108100
}
109101
}

0 commit comments

Comments
 (0)