Add support for custom source sets in Doma compile plugin

compile-java-test/build.gradle.kts

@@ -23,3 +23,10 @@ dependencies {
     testRuntimeOnly(libs.junit.jupiter.engine)
     testRuntimeOnly(libs.junit.platform.launcher)
 }
+
+sourceSets {
+    main {
+        java.srcDir("src/common/java")
+        resources.srcDir("src/common/resources")
+    }
+}

compile-java-test/src/common/java/common/Department.java

@@ -0,0 +1,10 @@
+package common;
+
+import org.seasar.doma.Entity;
+import org.seasar.doma.Id;
+
+@Entity
+public class Department {
+  @Id public Integer id;
+  public String name;
+}

compile-java-test/src/common/java/common/DepartmentDao.java

@@ -0,0 +1,14 @@
+package common;
+
+import org.seasar.doma.Dao;
+import org.seasar.doma.Script;
+import org.seasar.doma.Select;
+
+@Dao
+public interface DepartmentDao {
+  @Select
+  Department selectById(Integer id);
+
+  @Script
+  void create();
+}

compile-java-test/src/common/resources/META-INF/common/DepartmentDao/create.script

@@ -0,0 +1,4 @@
+create table department(
+    id integer not null primary key,
+    name varchar(20) not null,
+);

compile-java-test/src/common/resources/META-INF/common/DepartmentDao/selectById.sql

@@ -0,0 +1 @@
+select * from department where id = /*id*/0

compile-java-test/src/test/java/example/GenerationTest.java

@@ -2,6 +2,8 @@
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import common.DepartmentDaoImpl;
+import common._Department;
 import org.junit.jupiter.api.Test;
 
 public class GenerationTest {
@@ -10,5 +12,7 @@ public class GenerationTest {
   public void test() {
     assertNotNull(_Employee.class);
     assertNotNull(EmployeeDaoImpl.class);
+    assertNotNull(_Department.class);
+    assertNotNull(DepartmentDaoImpl.class);
   }
 }

compile-kotlin-test/build.gradle.kts

@@ -30,3 +30,12 @@ dependencies {
     testRuntimeOnly(libs.junit.jupiter.engine)
     testRuntimeOnly(libs.junit.platform.launcher)
 }
+
+kotlin {
+    sourceSets {
+        main {
+            kotlin.srcDir("src/common/kotlin")
+            resources.srcDir("src/common/resources")
+        }
+    }
+}

compile-kotlin-test/src/common/kotlin/common/Department.kt

@@ -0,0 +1,11 @@
+package common
+
+import org.seasar.doma.Entity
+import org.seasar.doma.Id
+
+@Entity
+class Department {
+    @Id
+    var id: Int? = null
+    var name: String? = null
+}

compile-kotlin-test/src/common/kotlin/common/DepartmentDao.kt

@@ -0,0 +1,14 @@
+package common
+
+import org.seasar.doma.Dao
+import org.seasar.doma.Script
+import org.seasar.doma.Select
+
+@Dao
+interface DepartmentDao {
+    @Select
+    fun selectById(id: Int?): Department?
+
+    @Script
+    fun create()
+}

compile-kotlin-test/src/common/resources/META-INF/common/DepartmentDao/create.script

@@ -0,0 +1,4 @@
+create table department(
+    id integer not null primary key,
+    name varchar(20) not null,
+);

compile-kotlin-test/src/common/resources/META-INF/common/DepartmentDao/selectById.sql

@@ -0,0 +1 @@
+select * from department where id = /*id*/0

compile-kotlin-test/src/main/kotlin/example/EmployeeDao.kt

@@ -1,13 +1,14 @@
 package example
 
+import common.Department
 import org.seasar.doma.Dao
 import org.seasar.doma.Script
 import org.seasar.doma.Select
 
 @Dao
 interface EmployeeDao {
     @Select
-    fun selectById(id: Int?): Employee?
+    fun selectById(id: Int?): Department?
 
     @Script
     fun create()

compile/src/main/groovy/org/seasar/doma/gradle/compile/KotlinCompileConfigurator.groovy

@@ -29,7 +29,7 @@ class KotlinCompileConfigurator {
         def kapt = project.extensions.getByName(KAPT_EXTENSION_NAME)
         def resourceDirs = sourceSet.resources.srcDirs
         def sourcePath = resourceDirs.join(File.pathSeparator)
-        
+
         kapt.javacOptions {
             option SOURCE_PATH_OPTION, sourcePath
             option PARAMETERS_OPTION, ''

compile/src/main/java/org/seasar/doma/gradle/compile/CompileConfigurator.java

@@ -19,14 +19,19 @@ class CompileConfigurator {
   }
 
   void configure() {
+    // Configure immediately for Java
     var javaExtension = project.getExtensions().getByType(JavaPluginExtension.class);
     var mainSourceSet = javaExtension.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
+    javaConfigurator.configure(mainSourceSet);
 
-    configureSourceSet(mainSourceSet);
-  }
-
-  private void configureSourceSet(SourceSet sourceSet) {
-    javaConfigurator.configure(sourceSet);
-    kotlinConfigurator.configure(sourceSet);
+    // Defer Kotlin configuration until after project evaluation
+    project.afterEvaluate(
+        evaluatedProject -> {
+          var evaluatedJavaExtension =
+              evaluatedProject.getExtensions().getByType(JavaPluginExtension.class);
+          var evaluatedMainSourceSet =
+              evaluatedJavaExtension.getSourceSets().getByName(SourceSet.MAIN_SOURCE_SET_NAME);
+          kotlinConfigurator.configure(evaluatedMainSourceSet);
+        });
   }
 }

compile/src/main/java/org/seasar/doma/gradle/compile/JavaCompileConfigurator.java

@@ -17,16 +17,20 @@ class JavaCompileConfigurator {
   }
 
   void configure(SourceSet sourceSet) {
-    var resourceDirs = sourceSet.getResources().getSrcDirs();
     var compileTaskName = sourceSet.getCompileJavaTaskName();
-
     project
         .getTasks()
         .named(compileTaskName, JavaCompile.class)
-        .configure(
-            javaCompile -> {
-              javaCompile.getOptions().setSourcepath(project.files(resourceDirs));
-              javaCompile.getOptions().getCompilerArgs().add(PARAMETERS_COMPILER_ARG);
-            });
+        .configure(javaCompile -> configureJavaCompile(sourceSet, javaCompile));
+  }
+
+  private void configureJavaCompile(SourceSet sourceSet, JavaCompile javaCompile) {
+    javaCompile.doFirst(
+        __ -> {
+          var resourceDirs = sourceSet.getResources().getSrcDirs();
+          var options = javaCompile.getOptions();
+          options.setSourcepath(project.files(resourceDirs));
+          options.getCompilerArgs().add(PARAMETERS_COMPILER_ARG);
+        });
   }
 }