Replace publishWithWriter with publishWithStream

GradleUp · Dec 12, 2024 · 49f710a · 49f710a
1 parent 0c9494b
commit 49f710a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 21 deletions.
diff --git a/...t/groovy/com/github/jengelman/gradle/plugins/shadow/util/AppendableMavenFileModule.groovy b/...t/groovy/com/github/jengelman/gradle/plugins/shadow/util/AppendableMavenFileModule.groovy
@@ -37,11 +37,11 @@ class AppendableMavenFileModule extends MavenFileModule {
         }
         String classifier = (String) artifact['classifier'] ?: ''
         if (files.containsKey(classifier)) {
-            publishWithStream(artifactFile) { OutputStream os ->
+            publish(artifactFile) { OutputStream os ->
                 IOUtils.copy(files[classifier].newInputStream(), os)
             }
         } else {
-            publishWithStream(artifactFile) { OutputStream os ->
+            publish(artifactFile) { OutputStream os ->
                 writeJar(os, contents[classifier])
             }
         }

diff --git a/...ovy/com/github/jengelman/gradle/plugins/shadow/util/repo/maven/AbstractMavenModule.groovy b/...ovy/com/github/jengelman/gradle/plugins/shadow/util/repo/maven/AbstractMavenModule.groovy
@@ -112,13 +112,13 @@ abstract class AbstractMavenModule extends AbstractModule implements MavenModule
         updateRootMavenMetaData(rootMavenMetaData)
 
         if (publishesMetaDataFile) {
-            publishWithWriter(metaDataFile) { Writer writer ->
+            publish(metaDataFile) { OutputStream outputStream ->
                 MetadataXpp3Writer metadataWriter = new MetadataXpp3Writer()
-                metadataWriter.write(writer, getMetaData([]))
+                metadataWriter.write(outputStream, getMetaData([]))
             }
         }
 
-        publishWithWriter(pomFile) { Writer writer ->
+        publish(pomFile) { OutputStream outputStream ->
             def pomPackaging = packaging ?: type
             // Create a new Maven Model
             Model model = new Model()
@@ -132,7 +132,7 @@ abstract class AbstractMavenModule extends AbstractModule implements MavenModule
 
             // Write the model to the POM file
             MavenXpp3Writer pomWriter = new MavenXpp3Writer()
-            pomWriter.write(writer, model)
+            pomWriter.write(outputStream, model)
         }
         return this
     }
@@ -144,9 +144,9 @@ abstract class AbstractMavenModule extends AbstractModule implements MavenModule
             allVersions = metaData.versioning.versions
         }
         allVersions << version
-        publishWithWriter(rootMavenMetaData) { Writer writer ->
+        publish(rootMavenMetaData) { OutputStream outputStream ->
             MetadataXpp3Writer metadataWriter = new MetadataXpp3Writer()
-            metadataWriter.write(writer, getMetaData(allVersions))
+            metadataWriter.write(outputStream, getMetaData(allVersions))
         }
     }
 
@@ -187,8 +187,8 @@ abstract class AbstractMavenModule extends AbstractModule implements MavenModule
         if (type == 'pom') {
             return artifactFile
         }
-        publishWithWriter(artifactFile) { Writer writer ->
-            writer << "${artifactFile.name} : $artifactContent"
+        publish(artifactFile) { OutputStream outputStream ->
+            outputStream.write("${artifactFile.name} : $artifactContent".bytes)
         }
         return artifactFile
     }

diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/repo/AbstractModule.kt b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/util/repo/AbstractModule.kt
@@ -3,25 +3,16 @@ package com.github.jengelman.gradle.plugins.shadow.util.repo
 import com.github.jengelman.gradle.plugins.shadow.util.HashUtil
 import java.io.File
 import java.io.OutputStream
-import java.io.Writer
 import java.math.BigInteger
 
 abstract class AbstractModule {
 
   protected abstract fun onPublish(file: File)
 
-  protected fun publishWithWriter(file: File, action: (Writer) -> Unit) {
-    publishCommon(file) { it.writer().use(action) }
-  }
-
-  protected fun publishWithStream(file: File, action: (OutputStream) -> Unit) {
-    publishCommon(file) { it.outputStream().use(action) }
-  }
-
-  private fun publishCommon(file: File, action: (File) -> Unit) {
+  protected fun publish(file: File, action: (OutputStream) -> Unit) {
     val hashBefore = if (file.exists()) getHash(file, "sha1") else null
     val tempFile = file.resolveSibling("${file.name}.tmp")
-    action(tempFile)
+    tempFile.outputStream().use(action)
 
     val hashAfter = getHash(tempFile, "sha1")
     if (hashAfter == hashBefore) {