Tweak and fix

GradleUp · Jan 1, 2025 · b9373fb · b9373fb
1 parent c6247de
commit b9373fb
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 31 deletions.
diff --git a/src/docs/configuration/merging/README.md b/src/docs/configuration/merging/README.md
@@ -9,7 +9,6 @@ This allows a [`Transformer`](https://gradleup.com/shadow/api/com/github/jengelm
 determine if it should process a particular entry and apply any modifications before writing the stream to the output.
 
 ```groovy
-// Adding a Transformer
 import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
 import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
 import javax.annotation.Nonnull
@@ -38,7 +37,6 @@ tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.Shadow
 Additionally, a `Transformer` can accept a `Closure` to configure the provided `Transformer`.
 
 ```groovy
-// Configuring a Transformer
 import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
 import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
 import javax.annotation.Nonnull
@@ -71,7 +69,6 @@ tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.Shadow
 An instantiated instance of a `Transformer` can also be provided.
 
 ```groovy
-// Adding a Transformer Instance
 import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
 import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
 import javax.annotation.Nonnull

diff --git a/src/docs/publishing/README.md b/src/docs/publishing/README.md
@@ -21,7 +21,7 @@ publishing {
   }
   repositories {
     maven {
-      url "https://repo.myorg.com"
+      url = "https://repo.myorg.com"
     }
   }
 }

diff --git a/...est/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/executor/GroovyBuildExecutor.kt b/...est/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/executor/GroovyBuildExecutor.kt
@@ -5,7 +5,6 @@ import java.nio.file.Path
 import kotlin.io.path.createDirectory
 import kotlin.io.path.writeText
 import org.gradle.testkit.runner.GradleRunner
-import org.intellij.lang.annotations.Language
 
 class GroovyBuildExecutor(
   override val fixture: SnippetFixture,
@@ -14,7 +13,23 @@ class GroovyBuildExecutor(
 ) : SnippetExecutor {
 
   override fun execute(tempDir: Path, snippet: String) {
-    tempDir.resolve("settings.gradle").writeText(settingsBuildText)
+    tempDir.resolve("settings.gradle").writeText(
+      """
+        dependencyResolutionManagement {
+          repositories {
+            mavenLocal()
+            mavenCentral()
+          }
+        }
+        include 'api', 'main'
+      """.trimIndent(),
+    )
+    val projectBuildText = """
+      plugins {
+        id 'java'
+        id 'com.gradleup.shadow'
+      }
+    """.trimIndent() + System.lineSeparator()
     tempDir.addSubProject("api", projectBuildText)
 
     val (imports, snippetWithoutImports) = importExtractor(snippet)
@@ -24,7 +39,6 @@ class GroovyBuildExecutor(
 
     val allArguments = listOf(
       "--warning-mode=fail",
-      "--configuration-cache",
       "--stacktrace",
     ) + arguments
     try {
@@ -45,24 +59,4 @@ class GroovyBuildExecutor(
       .resolve("build.gradle")
       .writeText(buildScriptText)
   }
-
-  private companion object {
-    @Language("Groovy")
-    private val settingsBuildText = """
-      rootProject.name = 'shadowTest'
-      include 'api', 'main'
-    """.trimIndent()
-
-    @Language("Groovy")
-    private val projectBuildText = """
-      plugins {
-        id 'java'
-        id 'com.gradleup.shadow'
-      }
-      repositories {
-        mavenLocal()
-        mavenCentral()
-      }
-    """.trimIndent()
-  }
 }
diff --git a/...ntiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/fixture/GroovyDslFixture.kt b/...ntiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/fixture/GroovyDslFixture.kt
@@ -11,10 +11,6 @@ object GroovyDslFixture : SnippetFixture {
       id("com.gradleup.shadow")
       id("application")
     }
-    repositories {
-      mavenLocal()
-      mavenCentral()
-    }
     version = "1.0"
     group = "shadow"
   """.trimIndent()
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ publishing { @@
       }
       repositories {
         maven {
-          url "https://repo.myorg.com"
+          url = "https://repo.myorg.com"
         }
       }
     }
@@ Expand Down @@