make rawBuildScript append instead of replace

this makes it more useful to use in extension functions in downstream projects
update to newer nebula plugin plugin

Author: John Burns

.github/workflows/nebula.yml

@@ -53,7 +53,7 @@ jobs:
           restore-keys: |
             - ${{ runner.os }}-gradlewrapper-
       - name: Gradle build
-        run: ./gradlew --info --stacktrace build
+        run: ./gradlew --stacktrace build
         env:
           JDK_VERSION_FOR_TESTS: ${{ matrix.java }}
   validatepluginpublication:

build.gradle.kts

@@ -18,7 +18,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
  * limitations under the License.
  */
 plugins {
-    id("com.netflix.nebula.plugin-plugin") version ("21.3.5")
+    id("com.netflix.nebula.plugin-plugin") version ("23.1.0")
     id("java-library")
     `kotlin-dsl`
     jacoco

src/main/java/nebula/test/dsl/ProjectBuilder.java

@@ -21,8 +21,7 @@ public class ProjectBuilder {
     private final List<String> dependencies = new ArrayList<>();
     @Nullable
     private Integer javaToolchain = null;
-    @Nullable
-    private String rawBuildScript;
+    private final List<String> rawBuildScript = new ArrayList<>();
     @Nullable
     private String group = null;
     @Nullable
@@ -54,7 +53,7 @@ public void dependencies(String... dependencies) {
     }
 
     public void rawBuildScript(String buildScript) {
-        rawBuildScript = buildScript;
+        rawBuildScript.add(buildScript);
     }
 
     @NebulaTestKitDsl
@@ -64,6 +63,7 @@ public SourcesBuilder src() {
 
     /**
      * Set project group
+     *
      * @param group group name to set on project
      */
     @NebulaTestKitDsl
@@ -73,6 +73,7 @@ public void group(String group) {
 
     /**
      * Set project version, which is equivalent to passing -Pversion on the command line
+     *
      * @param version group name to set on project
      */
     @NebulaTestKitDsl
@@ -100,13 +101,10 @@ void build(BuildscriptLanguage language) {
             buildFileText.append("        languageVersion = JavaLanguageVersion.of(").append(javaToolchain).append(")\n");
             buildFileText.append("    }\n}\n");
         }
-        if (rawBuildScript != null) {
-            buildFileText.append(rawBuildScript);
-        }
+        buildFileText.append(String.join("\n", rawBuildScript));
         final String ext = language == BuildscriptLanguage.GROOVY ? "gradle" : "gradle.kts";
         final Path buildFile = projectDir.toPath().resolve("build." + ext);
         try {
-            buildFile.toFile().createNewFile();
             Files.write(buildFile, buildFileText.toString().getBytes(StandardCharsets.UTF_8));
         } catch (IOException e) {
             throw new RuntimeException("Error writing to " + buildFile.toAbsolutePath(), e);

src/test/java/nebula/test/SupportedGradleVersion.java

@@ -1,7 +1,7 @@
 package nebula.test;
 
 public enum SupportedGradleVersion {
-    MIN("8.12.1"), MAX("9.1.0");
+    MIN("8.12.1"), MAX("9.2.0");
     public final String version;
     SupportedGradleVersion(String version) {
         this.version = version;

src/test/kotlin/nebula/test/dsl/KotlinDslTest.kt

@@ -21,19 +21,7 @@ internal class KotlinDslTest {
                 plugins {
                     java()
                 }
-                src {
-                    main {
-                        java("Main.java") {
-                            // language=java
-                            """
-public class Main {
-    public static void main(String[] args) {
-    }
-}
-"""
-                        }
-                    }
-                }
+                mainSource()
             }
         }
 
@@ -77,19 +65,7 @@ public class Main {
                 group("com.example")
                 version("1.0.0")
                 dependencies("""implementation("org.jspecify:jspecify:1.0.0")""")
-                src {
-                    main {
-                        java("Main.java") {
-                            // language=java
-                            """
-public class Main {
-    public static void main(String[] args) {
-    }
-}
-"""
-                        }
-                    }
-                }
+                mainSource()
             }
         }
 
@@ -134,19 +110,7 @@ public class Main {
                 plugins {
                     java()
                 }
-                src {
-                    main {
-                        java("Main.java") {
-                            // language=java
-                            """
-public class Main {
-    public static void main(String[] args) {
-    }
-}
-"""
-                        }
-                    }
-                }
+                mainSource()
             }
         }
 
@@ -230,19 +194,7 @@ public clss Main { // compile error
                 plugins {
                     java()
                 }
-                src {
-                    main {
-                        java("Main.java") {
-                            // language=java
-                            """
-public class Main {
-    public static void main(String[] args) {
-    }
-}
-"""
-                        }
-                    }
-                }
+                mainSource()
             }
         }
 
@@ -258,4 +210,49 @@ public class Main {
         }
         assertThat(result2).task(":compileJava").hasOutcome(TaskOutcome.FROM_CACHE)
     }
+
+    @ParameterizedTest
+    @EnumSource(SupportedGradleVersion::class)
+    fun `test rawBuildScript is additive`(gradleVersion: SupportedGradleVersion) {
+        val runner = testProject(testProjectDir) {
+            settings {
+                name("library")
+            }
+            rootProject {
+                mainSource()
+                rawBuildScript("plugins { java }")
+                rawBuildScript("repositories { mavenCentral() }")
+                rawBuildScript("""group = "com.example"""")
+                rawBuildScript("""version = "1.0.0"""")
+            }
+        }
+
+        val result = runner.run("build") {
+            forwardOutput()
+            withGradleVersion(gradleVersion.version)
+        }
+
+        assertThat(result)
+            .hasNoDeprecationWarnings()
+            .hasNoMutableStateWarnings()
+        assertThat(result).task(":compileJava").hasOutcome(TaskOutcome.SUCCESS)
+        assertThat(result).task(":build").hasOutcome(TaskOutcome.SUCCESS)
+        assertThat(testProjectDir.resolve("build/libs/library-1.0.0.jar")).exists()
+    }
+
+    fun ProjectBuilder.mainSource(){
+        src {
+            main {
+                java("Main.java") {
+                    // language=java
+                    """
+public class Main {
+    public static void main(String[] args) {
+    }
+}
+"""
+                }
+            }
+        }
+    }
 }