Get rid of project after evaluate in favour of lazy config for source…

…s set
revolut-engineering · Oct 28, 2019 · b12e666 · b12e666
1 parent 88eb21a
commit b12e666
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 11 deletions.
diff --git a/src/main/kotlin/com/revolut/jooq/GenerateJooqClassesTask.kt b/src/main/kotlin/com/revolut/jooq/GenerateJooqClassesTask.kt
@@ -90,9 +90,11 @@ open class GenerateJooqClassesTask : DefaultTask() {
 
 
     init {
-        project.afterEvaluate {
-            val sourceSets = project.properties["sourceSets"] as SourceSetContainer
-            sourceSets.getByName("main").java.srcDir(outputDirectory.get())
+        val sourceSets = project.properties["sourceSets"] as SourceSetContainer
+        sourceSets.named("main") {
+            java {
+                srcDir(outputDirectory)
+            }
         }
     }
 

diff --git a/src/main/kotlin/com/revolut/jooq/JooqDockerPlugin.kt b/src/main/kotlin/com/revolut/jooq/JooqDockerPlugin.kt
@@ -3,21 +3,15 @@ package com.revolut.jooq
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPlugin
-import org.gradle.api.tasks.compile.JavaCompile
 
 open class JooqDockerPlugin : Plugin<Project> {
 
     override fun apply(project: Project) {
         project.pluginManager.apply(JavaPlugin::class.java)
         project.extensions.create("jooq", JooqExtension::class.java)
         project.configurations.create("jdbc")
-        project.tasks.apply {
-            val generateJooqClasses = create("generateJooqClasses", GenerateJooqClassesTask::class.java) {
-                group = "jooq"
-            }
-            withType(JavaCompile::class.java) {
-                dependsOn(generateJooqClasses)
-            }
+        project.tasks.create("generateJooqClasses", GenerateJooqClassesTask::class.java) {
+            group = "jooq"
         }
     }
 }
diff --git a/src/test/groovy/JooqDockerPluginSpec.groovy b/src/test/groovy/JooqDockerPluginSpec.groovy
@@ -728,6 +728,45 @@ class JooqDockerPluginSpec extends Specification {
         Files.notExists(generatedFlywaySchemaClass)
     }
 
+    def "outputDirectory task property is respected"() {
+        given:
+        prepareBuildGradleFile(projectDir,
+                """
+                      plugins {
+                          id("com.revolut.jooq-docker")
+                      }
+                      
+                      repositories {
+                          jcenter()
+                      }
+                      
+                      tasks {
+                          generateJooqClasses {
+                              outputDirectory.set(project.layout.buildDirectory.dir("gen"))
+                          }
+                      }
+                      
+                      dependencies {
+                          "jdbc"("org.postgresql:postgresql:42.2.5")
+                      }
+                      """)
+        copyResource("/V01__init.sql", new File(projectDir, "src/main/resources/db/migration/V01__init.sql"))
+
+        when:
+        def result = GradleRunner.create()
+                .withProjectDir(projectDir)
+                .withPluginClasspath()
+                .withArguments("generateJooqClasses")
+                .build()
+
+        then:
+        result.task(":generateJooqClasses").outcome == SUCCESS
+        def generatedFooClass = Paths.get(projectDir.getPath(), "build/gen/org/jooq/generated/tables/Foo.java")
+        def generatedFlywayClass = Paths.get(projectDir.getPath(), "build/gen/org/jooq/generated/tables/FlywaySchemaHistory.java")
+        Files.exists(generatedFooClass)
+        Files.exists(generatedFlywayClass)
+    }
+
     private static void prepareBuildGradleFile(File dir, String script) {
         def buildGradleFile = new File(dir, "build.gradle.kts")
         buildGradleFile.write(script)