Merge pull request #231 from domaframework/chore/improve-project-structure

Improve project structure and migrate to Gradle version catalog

Author: nakamura-to

.github/workflows/ci.yml

@@ -19,23 +19,22 @@ jobs:
           distribution: 'zulu'
           java-version: 21
 
-      - name: Grant execute permission for ./gradlew
+      - name: Grant execute permission for codegen/gradlew
+        working-directory: ./codegen
         run: chmod +x gradlew
 
-      - name: Grant execute permission for codegen-test/gradlew
-        working-directory: ./codegen-test
-        run: chmod +x gradlew
+      - name: Build
+        working-directory: ./codegen
+        run: ./gradlew build
 
-      - name: Assemble and Check
-        run: ./gradlew assemble check
+      - name: Grant execute permission for ./gradlew
+        run: chmod +x gradlew
 
       - name: Test plugin (generate Java code)
-        working-directory: ./codegen-test
-        run: ./gradlew domaCodeGenJavaAll build
+        run: ./gradlew clean domaCodeGenJavaAll build
 
       - name: Test plugin (generate Kotlin code)
-        working-directory: ./codegen-test
-        run: ./gradlew domaCodeGenKotlinAll build
+        run: ./gradlew clean domaCodeGenKotlinAll build
 
       - name: Set version
         id: set-version
@@ -46,4 +45,5 @@ jobs:
 
       - name: Publish plugin
         if: github.event_name == 'push' && endsWith(steps.set-version.outputs.version, 'SNAPSHOT') == false
+        working-directory: ./codegen
         run: ./gradlew publishPlugins -Pgradle.publish.key=${{ secrets.GRADLE_PUBLISH_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_PUBLISH_SECRET }}

.gitignore

@@ -9,3 +9,11 @@
 /.idea/
 .factorypath
 /.claude/
+/data/
+/.apt_generated/
+
+/src/main/java/codegen
+/src/main/kotlin/codegen
+/src/main/resources/META-INF/codegen
+/src/test/java/codegen
+/src/test/kotlin/codegen

build.gradle.kts

@@ -1,6 +1,11 @@
+import org.seasar.doma.gradle.codegen.desc.LanguageType
+
 plugins {
     java
-    id("net.researchgate.release") version "3.1.0"
+    alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.doma.compile)
+    alias(libs.plugins.release)
+    id("org.domaframework.doma.codegen")
 }
 
 configure<net.researchgate.release.ReleaseExtension> {
@@ -11,11 +16,87 @@ configure<net.researchgate.release.ReleaseExtension> {
     }
 }
 
-allprojects {
-    apply(plugin = "java")
-    tasks {
-        test {
-            useJUnitPlatform()
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
+
+dependencies {
+    implementation(libs.doma.core)
+    annotationProcessor(libs.doma.processor)
+
+    // Use JUnit BOM for version management
+    testImplementation(platform(libs.junit.bom))
+    testImplementation(libs.junit.jupiter.api)
+    testRuntimeOnly(libs.junit.jupiter.engine)
+    testRuntimeOnly(libs.junit.platform.launcher)
+
+    testRuntimeOnly(platform(libs.testcontainers.bom))
+    testRuntimeOnly(libs.testcontainers.postgresql)
+    testRuntimeOnly(libs.postgresql)
+
+    domaCodeGen(platform(libs.testcontainers.bom))
+    domaCodeGen(libs.testcontainers.postgresql)
+    domaCodeGen(libs.postgresql)
+}
+
+val initScript = file("init_postgresql.sql")
+val _url = "jdbc:tc:postgresql:13.21:///test?TC_INITSCRIPT=file:${initScript.absolutePath}"
+val _user = ""
+val _password = ""
+
+domaCodeGen {
+    register("java") {
+        val basePackage = "codegen"
+        url.set(_url)
+        user.set(_user)
+        password.set(_password)
+        entity {
+            packageName = "${basePackage}.j.entity"
+        }
+        dao {
+            packageName = "${basePackage}.j.dao"
+        }
+    }
+    register("kotlin") {
+        val basePackage = "codegen"
+        url.set(_url)
+        user.set(_user)
+        password.set(_password)
+        languageType.set(LanguageType.KOTLIN)
+        entity {
+            packageName = "${basePackage}.k.entity"
+        }
+        dao {
+            packageName = "${basePackage}.k.dao"
         }
     }
 }
+
+tasks {
+    test {
+        useJUnitPlatform()
+    }
+
+    val deleteSrc = register("deleteSrc") {
+        doLast {
+            delete("src/main/java/codegen")
+            delete("src/main/kotlin/codegen")
+            delete("src/main/resources/META-INF/codegen")
+            delete("src/test/java/codegen")
+            delete("src/test/kotlin/codegen")
+        }
+    }
+
+    clean {
+        dependsOn(deleteSrc)
+    }
+
+    build {
+        mustRunAfter("domaCodeGenJavaAll", "domaCodeGenKotlinAll")
+    }
+}