Use Doma 3

Author: nakamura-to

README.md

@@ -5,11 +5,11 @@ Simple examples for [Doma](https://github.com/domaframework/doma).
 
 This repository includes the following examples:
 
-* [dao-style-basic](dao-style-basic) - Shows basic DAO style. Written in Java 8.
-* [dao-style-file](dao-style-file) - Uses files to store SQL templates. Written in Java 8.
-* [dao-style-text](dao-style-text) - Uses Text Blocks to store SQL templates. Written in Java 17.
-* [dsl-style-java](dsl-style-java) - Uses the Criteria API. Written in Java 8.
-* [jpms-java](jpms-java) - Uses the Java Platform Module System (JPMS). Written in Java 17.
+* [dao-style-basic](dao-style-basic) - Shows basic DAO style.
+* [dao-style-file](dao-style-file) - Uses files to store SQL templates.
+* [dao-style-text](dao-style-text) - Uses Text Blocks to store SQL templates.
+* [dsl-style-java](dsl-style-java) - Uses the Criteria API.
+* [jpms-java](jpms-java) - Uses the Java Platform Module System (JPMS).
 
 Clone this repository
 ---------------------
@@ -40,4 +40,4 @@ Import the project as a Gradle project.
 
 ### Eclipse
 
-Import the project as a Gradle project.
+Import the project as a Eclipse project.

build.gradle.kts

@@ -11,6 +11,12 @@ subprojects {
     apply(plugin = "com.diffplug.spotless")
     apply(plugin = "org.domaframework.doma.compile")
 
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(17))
+        }
+    }
+
     tasks {
         withType<JavaCompile> {
             options.encoding = "UTF-8"
@@ -32,8 +38,8 @@ subprojects {
         annotationProcessor("org.seasar.doma:doma-processor:${domaVersion}")
         implementation("org.seasar.doma:doma-core:${domaVersion}")
         implementation("org.seasar.doma:doma-slf4j:${domaVersion}")
-        runtimeOnly("ch.qos.logback:logback-classic:1.2.11")
-        runtimeOnly("com.h2database:h2:2.2.224")
+        runtimeOnly("ch.qos.logback:logback-classic:1.5.7")
+        runtimeOnly("com.h2database:h2:2.3.232")
         testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.0")
         testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.0")
     }
@@ -62,7 +68,7 @@ subprojects {
 
     spotless {
         java {
-            googleJavaFormat("1.12.0")
+            googleJavaFormat("1.23.0")
         }
     }
 }

dao-style-basic/build.gradle.kts

@@ -17,11 +17,3 @@ dependencies {
     implementation("org.seasar.doma:doma-core:${domaVersion}")
     implementation("org.seasar.doma:doma-slf4j:${domaVersion}")
 }
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
-    }
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}

dao-style-file/build.gradle.kts

@@ -17,11 +17,3 @@ dependencies {
     implementation("org.seasar.doma:doma-core:${domaVersion}")
     implementation("org.seasar.doma:doma-slf4j:${domaVersion}")
 }
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
-    }
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}

dao-style-text/build.gradle.kts

@@ -2,15 +2,12 @@ plugins {
     java
 }
 
-val javaVersion = 17
-
 tasks {
     compileJava {
         val aptOptions = extensions.getByType<com.diffplug.gradle.eclipse.apt.AptPlugin.AptOptions>()
         aptOptions.processorArgs = mapOf(
                 "doma.domain.converters" to "example.dao_style_text.domain.DomainConverterProvider"
         )
-        options.release = javaVersion
     }
 }
 
@@ -21,8 +18,3 @@ dependencies {
     implementation("org.seasar.doma:doma-slf4j:${domaVersion}")
 }
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(javaVersion))
-    }
-}

dao-style-text/src/main/java/example/dao_style_text/dao/EmployeeDao.java

@@ -172,7 +172,8 @@ public interface EmployeeDao {
   @Select
   List<Employee> selectBySalary(Salary salary);
 
-  @Sql("""
+  @Sql(
+      """
       select
         sum(salary)
       from

dsl-style-java/build.gradle.kts

@@ -17,11 +17,3 @@ dependencies {
     implementation("org.seasar.doma:doma-core:${domaVersion}")
     implementation("org.seasar.doma:doma-slf4j:${domaVersion}")
 }
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
-    }
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}

gradle.properties

@@ -1,4 +1,4 @@
-domaVersion=2.62.1
+domaVersion=3.0.0
 
 # https://github.com/diffplug/spotless/issues/834
 org.gradle.jvmargs=-Dfile.encoding=UTF-8 \

jpms-java/build.gradle.kts

@@ -3,15 +3,12 @@ plugins {
     application
 }
 
-val javaVersion = 17
-
 tasks {
     compileJava {
         val aptOptions = extensions.getByType<com.diffplug.gradle.eclipse.apt.AptPlugin.AptOptions>()
         aptOptions.processorArgs = mapOf(
             "doma.domain.converters" to "example.jpms_java.domain.DomainConverterProvider"
         )
-        options.release = javaVersion
     }
 }
 
@@ -25,9 +22,3 @@ dependencies {
 application {
     mainClass.set("example.jpms_java.Main")
 }
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(javaVersion))
-    }
-}