Merge pull request #58 from domaframework/dependencies/require-java-17

Update Gradle, Java and other dependencies

Author: nakamura-to

.github/workflows/ci.yml

@@ -14,15 +14,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
-
-      - name: Grant execute permission for compile/gradlew
-        working-directory: ./compile
-        run: chmod +x gradlew
+          java-version: 21
 
       - name: Grant execute permission for compile-java-test/gradlew
         working-directory: ./compile-java-test
@@ -37,7 +33,6 @@ jobs:
         run: chmod +x gradlew
 
       - name: Build plugin
-        working-directory: ./compile
         run: ./gradlew build
 
       - name: Test plugin against Java
@@ -54,13 +49,11 @@ jobs:
 
       - name: Set version
         id: set-version
-        working-directory: ./compile
         run: ./gradlew properties | grep "^version:" | awk '{print $2}' | { read v; echo "::set-output name=version::$v"; }
 
       - name: Print version
         run: echo ${{ steps.set-version.outputs.version }}
 
       - name: Publish plugin
         if: github.event_name == 'push' && endsWith(steps.set-version.outputs.version, 'SNAPSHOT') == false
-        working-directory: ./compile
         run: ./gradlew publishPlugins -Pgradle.publish.key=${{ secrets.GRADLE_PUBLISH_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_PUBLISH_SECRET }}

.gitignore

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

.sdkmanrc

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

build.gradle.kts

@@ -0,0 +1,21 @@
+plugins {
+    java
+    id("net.researchgate.release") version "3.0.2"
+}
+
+configure<net.researchgate.release.ReleaseExtension> {
+    newVersionCommitMessage.set("[Gradle Release Plugin] - [skip ci] new version commit: ")
+    tagTemplate.set("v\$version")
+    git {
+        requireBranch.set("master")
+    }
+}
+
+allprojects {
+    apply(plugin = "java")
+    tasks {
+        test {
+            useJUnitPlatform()
+        }
+    }
+}

compile-java-test/build.gradle

@@ -9,14 +9,16 @@ buildscript {
     }
 }
 
-apply plugin: 'java'
+plugins {
+    id 'java'
+}
+
 apply plugin: 'org.domaframework.doma.compile'
 
-ext.domaVersion = '2.29.0'
+ext.domaVersion = '3.0.0'
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    toolchain.languageVersion.set(JavaLanguageVersion.of( 17))
 }
 
 test {
@@ -30,8 +32,8 @@ repositories {
 }
 
 dependencies {
-    annotationProcessor "org.seasar.doma:doma:$domaVersion"
-    implementation "org.seasar.doma:doma:$domaVersion"
+    annotationProcessor "org.seasar.doma:doma-processor:$domaVersion"
+    implementation "org.seasar.doma:doma-core:$domaVersion"
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.1'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.1'
 }

compile-java-test/gradle/wrapper/gradle-wrapper.properties

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

compile-kotlin-test/build.gradle

@@ -6,26 +6,25 @@ buildscript {
     }
     dependencies {
         classpath "org.domaframework.doma:compile"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.22"
     }
 }
 
+plugins {
+    id 'java'
+    id 'org.jetbrains.kotlin.jvm' version '2.0.20'
+    id 'org.jetbrains.kotlin.kapt' version '2.0.20'
+}
+
 apply plugin: 'org.domaframework.doma.compile'
-apply plugin: 'kotlin'
-apply plugin: 'kotlin-kapt'
 
-ext.domaVersion = '2.29.0'
+ext.domaVersion = '3.0.0'
 
 kapt {
     includeCompileClasspath = false
 }
 
-compileKotlin {
-    kotlinOptions.jvmTarget = '1.8'
-}
-
-compileTestKotlin {
-    kotlinOptions.jvmTarget = '1.8'
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 }
 
 test {
@@ -39,8 +38,8 @@ repositories {
 }
 
 dependencies {
-    kapt "org.seasar.doma:doma:$domaVersion"
-    implementation "org.seasar.doma:doma:$domaVersion"
+    kapt "org.seasar.doma:doma-processor:$domaVersion"
+    implementation "org.seasar.doma:doma-core:$domaVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib"
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.1'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.1'

compile-kotlin-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.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

compile-mix-test/build.gradle

@@ -6,27 +6,25 @@ buildscript {
     }
     dependencies {
         classpath "org.domaframework.doma:compile"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.22"
     }
 }
 
+plugins {
+    id 'java'
+    id 'org.jetbrains.kotlin.jvm' version '2.0.20'
+    id 'org.jetbrains.kotlin.kapt' version '2.0.20'
+}
+
 apply plugin: 'org.domaframework.doma.compile'
-apply plugin: 'java'
-apply plugin: 'kotlin'
-apply plugin: 'kotlin-kapt'
 
-ext.domaVersion = '2.29.0'
+ext.domaVersion = '3.0.0'
 
 kapt {
     includeCompileClasspath = false
 }
 
-compileKotlin {
-    kotlinOptions.jvmTarget = '1.8'
-}
-
-compileTestKotlin {
-    kotlinOptions.jvmTarget = '1.8'
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of( 17))
 }
 
 test {
@@ -40,8 +38,8 @@ repositories {
 }
 
 dependencies {
-    kapt "org.seasar.doma:doma:$domaVersion"
-    implementation "org.seasar.doma:doma:$domaVersion"
+    kapt "org.seasar.doma:doma-processor:$domaVersion"
+    implementation "org.seasar.doma:doma-core:$domaVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib"
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.1'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.1'

compile-mix-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.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists