From 1a9b78b02922a24d59c79e64648cde8bcce46763 Mon Sep 17 00:00:00 2001 From: Goooler Date: Wed, 19 Nov 2025 16:13:17 +0800 Subject: [PATCH] Rename CleanProperties to ReproducibleProperties --- .../{CleanProperties.kt => ReproducibleProperties.kt} | 2 +- .../shadow/transformers/PropertiesFileTransformer.kt | 6 +++--- ...PropertiesTest.kt => ReproduciblePropertiesTest.kt} | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) rename src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/{CleanProperties.kt => ReproducibleProperties.kt} (95%) rename src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/{CleanPropertiesTest.kt => ReproduciblePropertiesTest.kt} (87%) diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/CleanProperties.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/ReproducibleProperties.kt similarity index 95% rename from src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/CleanProperties.kt rename to src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/ReproducibleProperties.kt index 87ac366dc..02c3a3097 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/CleanProperties.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/ReproducibleProperties.kt @@ -9,7 +9,7 @@ import java.util.Properties /** * Provides functionality for reproducible serialization. */ -internal class CleanProperties : Properties() { +internal class ReproducibleProperties : Properties() { override fun store(writer: Writer, comments: String) { throw UnsupportedOperationException("use writeWithoutComments()") } diff --git a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformer.kt b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformer.kt index 45d7aab58..92aeadc21 100644 --- a/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformer.kt +++ b/src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/transformers/PropertiesFileTransformer.kt @@ -1,6 +1,6 @@ package com.github.jengelman.gradle.plugins.shadow.transformers -import com.github.jengelman.gradle.plugins.shadow.internal.CleanProperties +import com.github.jengelman.gradle.plugins.shadow.internal.ReproducibleProperties import com.github.jengelman.gradle.plugins.shadow.internal.mapProperty import com.github.jengelman.gradle.plugins.shadow.internal.property import com.github.jengelman.gradle.plugins.shadow.internal.setProperty @@ -108,7 +108,7 @@ public open class PropertiesFileTransformer @Inject constructor( internal val conflicts: MutableMap> = mutableMapOf() @get:Internal - internal val propertiesEntries = mutableMapOf() + internal val propertiesEntries = mutableMapOf() @get:Input public open val paths: SetProperty = objectFactory.setProperty() @@ -149,7 +149,7 @@ public open class PropertiesFileTransformer @Inject constructor( } override fun transform(context: TransformerContext) { - val props = propertiesEntries.computeIfAbsent(context.path) { CleanProperties() } + val props = propertiesEntries.computeIfAbsent(context.path) { ReproducibleProperties() } loadAndTransformKeys(context.inputStream) { key, value -> if (props.containsKey(key)) { when (MergeStrategy.from(mergeStrategyFor(context.path))) { diff --git a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/CleanPropertiesTest.kt b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/ReproduciblePropertiesTest.kt similarity index 87% rename from src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/CleanPropertiesTest.kt rename to src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/ReproduciblePropertiesTest.kt index be5c5bd58..e0775596a 100644 --- a/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/CleanPropertiesTest.kt +++ b/src/test/kotlin/com/github/jengelman/gradle/plugins/shadow/internal/ReproduciblePropertiesTest.kt @@ -9,11 +9,11 @@ import java.nio.charset.StandardCharsets import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.MethodSource -class CleanPropertiesTest { +class ReproduciblePropertiesTest { @ParameterizedTest @MethodSource("generalCharsetsProvider") fun emptyProperties(charset: Charset) { - val output = CleanProperties().writeToString(charset) + val output = ReproducibleProperties().writeToString(charset) assertThat(output).isEqualTo("") } @@ -21,7 +21,7 @@ class CleanPropertiesTest { @ParameterizedTest @MethodSource("generalCharsetsProvider") fun asciiProps(charset: Charset) { - val output = CleanProperties().also { props -> + val output = ReproducibleProperties().also { props -> props["key"] = "value" props["key2"] = "value2" props["a"] = "b" @@ -50,7 +50,7 @@ class CleanPropertiesTest { @ParameterizedTest @MethodSource("utfCharsetsProvider") fun utfProps(charset: Charset) { - val output = CleanProperties().also { props -> + val output = ReproducibleProperties().also { props -> props["äöüß"] = "aouss" props["áèô"] = "aeo" props["€²³"] = "x" @@ -81,7 +81,7 @@ class CleanPropertiesTest { StandardCharsets.UTF_16, ) - fun CleanProperties.writeToString(charset: Charset): String { + fun ReproducibleProperties.writeToString(charset: Charset): String { return ByteArrayOutputStream().also { writeWithoutComments(charset, it) } .toString(charset.name()).invariantEolString }