Merge pull request #183 from domaframework/dependencies/update-all

Require Java 17

Author: nakamura-to

.github/workflows/ci.yml

@@ -13,11 +13,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 8
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 8
+          java-version: 21
 
       - name: Grant execute permission for ./gradlew
         run: chmod +x gradlew

.gitignore

@@ -8,4 +8,3 @@
 /.metadata
 /.idea/
 .factorypath
-.sdkmanrc

.sdkmanrc

@@ -0,0 +1,3 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=21-zulu

codegen-test/build.gradle

@@ -3,8 +3,8 @@ import org.seasar.doma.gradle.codegen.desc.LanguageType
 import org.seasar.doma.gradle.codegen.jdbc.SimpleDataSource
 
 buildscript {
-    ext.domaVersion = '2.62.1'
-    ext.h2Version= '1.4.200'
+    ext.domaVersion = '3.0.0'
+    ext.h2Version= '2.3.232'
     repositories {
         mavenCentral()
         mavenLocal()
@@ -19,15 +19,14 @@ buildscript {
 
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '1.9.25'
+    id 'org.jetbrains.kotlin.jvm' version '2.0.20'
     id 'org.seasar.doma.compile' version '1.1.0'
 }
 
 apply plugin: 'org.domaframework.doma.codegen'
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 }
 
 test {

codegen-test/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

codegen/build.gradle.kts

@@ -6,31 +6,26 @@ plugins {
 }
 
 gradlePlugin {
+    website.set("https://github.com/domaframework/doma-codegen-plugin")
+    vcsUrl.set("https://github.com/domaframework/doma-codegen-plugin.git")
     plugins {
         create("codegenPlugin") {
             id = "org.domaframework.doma.codegen"
             displayName = "Doma Codegen Plugin"
             description = "Generates Java, Kotlin, and SQL files from Database"
             implementationClass = "org.seasar.doma.gradle.codegen.CodeGenPlugin"
+            tags.set(listOf("doma", "generator"))
         }
     }
 }
 
-pluginBundle {
-    website = "https://github.com/domaframework/doma-codegen-plugin"
-    vcsUrl = "https://github.com/domaframework/doma-codegen-plugin.git"
-    tags = listOf("doma", "generator")
-}
-
 sourceSets {
     main {
         java {
-            setSrcDirs(emptyList<String>())
+            setSrcDirs(emptyList<String>()) 
         }
-        withConvention(GroovySourceSet::class) {
-            groovy {
-                setSrcDirs(listOf("src/main/groovy", "src/main/java"))
-            }
+        groovy {
+            setSrcDirs(listOf("src/main/groovy", "src/main/java"))
         }
     }
 }
@@ -44,10 +39,10 @@ spotless {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    toolchain.languageVersion.set(JavaLanguageVersion.of( 17))
 }
 
+
 repositories {
     mavenCentral()
     mavenLocal()
@@ -66,6 +61,10 @@ tasks {
     test {
         useJUnitPlatform()
     }
+    
+    javadoc {
+        enabled = false
+    }
 
     groovydoc {
         enabled = false