Process the buildscript block of project script plugins

See #180
gradle · Apr 18, 2018 · c3f4257 · c3f4257
1 parent d866927
commit c3f4257
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/provider/src/main/kotlin/org/gradle/kotlin/dsl/provider/KotlinScriptTarget.kt b/provider/src/main/kotlin/org/gradle/kotlin/dsl/provider/KotlinScriptTarget.kt
@@ -93,7 +93,7 @@ fun projectScriptTarget(
     KotlinScriptTarget(
         host = KotlinScriptHost(project, scriptSource, serviceRegistryOf(project), baseScope, scriptHandler),
         scriptTemplate = KotlinBuildScript::class,
-        buildscriptBlockTemplate = KotlinBuildscriptBlock::class.takeIf { topLevelScript },
+        buildscriptBlockTemplate = KotlinBuildscriptBlock::class,
         pluginsBlockTemplate = KotlinPluginsBlock::class.takeIf { topLevelScript },
         accessorsClassPath = accessorsClassPathProviderFor(project, topLevelScript),
         onPrepare = {

diff --git a/provider/src/test/kotlin/org/gradle/kotlin/dsl/integration/GradleKotlinDslIntegrationTest.kt b/provider/src/test/kotlin/org/gradle/kotlin/dsl/integration/GradleKotlinDslIntegrationTest.kt
@@ -64,6 +64,33 @@ class GradleKotlinDslIntegrationTest : AbstractIntegrationTest() {
             build("compute").output.contains("*42*"))
     }
 
+    @Test
+    fun `given a script plugin with a buildscript block, it will be used to compute its classpath`() {
+
+        withClassJar("fixture.jar", DeepThought::class.java)
+
+        withFile("other.gradle.kts", """
+            buildscript {
+                dependencies { classpath(files("fixture.jar")) }
+            }
+
+            task("compute") {
+                doLast {
+                    val computer = ${DeepThought::class.qualifiedName}()
+                    val answer = computer.compute()
+                    println("*" + answer + "*")
+                }
+            }
+        """)
+
+        withBuildScript("""
+            apply(from = "other.gradle.kts")
+        """)
+
+        assert(
+            build("compute").output.contains("*42*"))
+    }
+
     @Test
     fun `given a buildSrc dir, it will be added to the compilation classpath`() {