diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 512c311..e6ee642 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,31 +20,15 @@ jobs: distribution: 'zulu' java-version: 21 - - name: Grant execute permission for compile-java-test/gradlew - working-directory: ./compile-java-test + - name: Grant execute permission for compile/gradlew + working-directory: ./compile run: chmod +x gradlew - - name: Grant execute permission for compile-kotlin-test/gradlew - working-directory: ./compile-kotlin-test - run: chmod +x gradlew - - - name: Grant execute permission for compile-mix-test/gradlew - working-directory: ./compile-mix-test - run: chmod +x gradlew - - - name: Build plugin - run: ./gradlew build - - - name: Test plugin against Java - working-directory: ./compile-java-test - run: ./gradlew build - - - name: Test plugin against Kotlin - working-directory: ./compile-kotlin-test + - name: Build compile-plugin + working-directory: ./compile run: ./gradlew build - - name: Test plugin against a mix of Java and Kotlin - working-directory: ./compile-mix-test + - name: Test run: ./gradlew build - name: Set version @@ -55,5 +39,6 @@ jobs: run: echo ${{ steps.set-version.outputs.version }} - name: Publish plugin + working-directory: ./compile if: github.event_name == 'push' && endsWith(steps.set-version.outputs.version, 'SNAPSHOT') == false run: ./gradlew publishPlugins -Pgradle.publish.key=${{ secrets.GRADLE_PUBLISH_KEY }} -Pgradle.publish.secret=${{ secrets.GRADLE_PUBLISH_SECRET }} diff --git a/.gitignore b/.gitignore index be3c74e..bd2fe4d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /.metadata /.idea/ .factorypath +/.claude/ diff --git a/CLAUDE.md b/CLAUDE.md index e8328c0..a91142e 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -10,23 +10,14 @@ The Doma Compile Plugin is a Gradle plugin that allows annotation processors to ### Building the Plugin ```bash -./gradlew build +cd compile && ./gradlew build && cd .. ``` ### Running Tests -The plugin has three test suites that must be run in sequence: +The plugin has three test suites: ```bash -# Build the plugin first +# Build the all test projects ./gradlew build - -# Test with Java -cd compile-java-test && ./gradlew build && cd .. - -# Test with Kotlin -cd compile-kotlin-test && ./gradlew build && cd .. - -# Test with mixed Java/Kotlin -cd compile-mix-test && ./gradlew build && cd .. ``` ### Code Formatting @@ -37,17 +28,17 @@ cd compile-mix-test && ./gradlew build && cd .. ### Running a Single Test ```bash -# In any test directory (compile-java-test, compile-kotlin-test, or compile-mix-test) -./gradlew test --tests "example.GenerationTest" +# With any test project (compile-java-test, compile-kotlin-test, or compile-mix-test) +./gradlew :compile-java-test:test --tests "example.GenerationTest" ``` ### Publishing (for maintainers) ```bash # Release a new version (from master branch only) -./gradlew release +cd compile && ./gradlew release && cd .. # Publish to Gradle Plugin Portal (handled by CI for non-SNAPSHOT versions) -./gradlew publishPlugins -Pgradle.publish.key= -Pgradle.publish.secret= +cd compile && ./gradlew publishPlugins -Pgradle.publish.key= -Pgradle.publish.secret= && cd.. ``` ## Architecture diff --git a/build.gradle.kts b/build.gradle.kts index 1fa6789..8ca0f9f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,21 +1,20 @@ plugins { java - id("net.researchgate.release") version "3.1.0" + alias(libs.plugins.spotless) } -configure { - newVersionCommitMessage.set("[Gradle Release Plugin] - [skip ci] new version commit: ") - tagTemplate.set("v\$version") - git { - requireBranch.set("master") - } -} +val catalog = libs allprojects { - apply(plugin = "java") - tasks { - test { - useJUnitPlatform() + apply(plugin = catalog.plugins.spotless.get().pluginId) + + spotless { + java { + googleJavaFormat(libs.versions.google.java.format.get()) } } -} + + repositories { + mavenCentral() + } +} \ No newline at end of file diff --git a/compile-java-test/build.gradle.kts b/compile-java-test/build.gradle.kts index 63f1736..37777c5 100644 --- a/compile-java-test/build.gradle.kts +++ b/compile-java-test/build.gradle.kts @@ -1,25 +1,11 @@ -buildscript { - repositories { - mavenCentral() - mavenLocal() - maven { - url = uri("https://oss.sonatype.org/content/repositories/snapshots/") - } - } - dependencies { - classpath("org.domaframework.doma:compile") - } -} - plugins { - id("java") + java id("org.domaframework.doma.compile") } -val domaVersion = "3.9.1" java { - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) + toolchain.languageVersion.set(JavaLanguageVersion.of(libs.versions.java.get().toInt())) } tasks { @@ -28,20 +14,12 @@ tasks { } } -repositories { - mavenCentral() - mavenLocal() - maven { - url = uri("https://oss.sonatype.org/content/repositories/snapshots/") - } -} - dependencies { - annotationProcessor("org.seasar.doma:doma-processor:$domaVersion") - implementation("org.seasar.doma:doma-core:$domaVersion") + annotationProcessor(libs.doma.processor) + implementation(libs.doma.core) // Use JUnit BOM for version management - testImplementation(platform("org.junit:junit-bom:5.13.2")) - testImplementation("org.junit.jupiter:junit-jupiter-api") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") - testRuntimeOnly("org.junit.platform:junit-platform-launcher") + testImplementation(platform(libs.junit.bom)) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) + testRuntimeOnly(libs.junit.platform.launcher) } diff --git a/compile-java-test/gradle/wrapper/gradle-wrapper.jar b/compile-java-test/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index f3d88b1..0000000 Binary files a/compile-java-test/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/compile-java-test/gradle/wrapper/gradle-wrapper.properties b/compile-java-test/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 1e2fbf0..0000000 --- a/compile-java-test/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/compile-java-test/gradlew b/compile-java-test/gradlew deleted file mode 100755 index 2fe81a7..0000000 --- a/compile-java-test/gradlew +++ /dev/null @@ -1,183 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git a/compile-java-test/gradlew.bat b/compile-java-test/gradlew.bat deleted file mode 100644 index 62bd9b9..0000000 --- a/compile-java-test/gradlew.bat +++ /dev/null @@ -1,103 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/compile-java-test/settings.gradle.kts b/compile-java-test/settings.gradle.kts index a638415..1b5e237 100644 --- a/compile-java-test/settings.gradle.kts +++ b/compile-java-test/settings.gradle.kts @@ -1,5 +1,9 @@ rootProject.name = "compile-java-test" -pluginManagement { - includeBuild("../compile") -} +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + from(files("../gradle/libs.versions.toml")) + } + } +} \ No newline at end of file diff --git a/compile-java-test/src/main/java/example/Employee.java b/compile-java-test/src/main/java/example/Employee.java index 21d4909..00819dd 100644 --- a/compile-java-test/src/main/java/example/Employee.java +++ b/compile-java-test/src/main/java/example/Employee.java @@ -5,7 +5,6 @@ @Entity public class Employee { - @Id - public Integer id; - public String name; + @Id public Integer id; + public String name; } diff --git a/compile-java-test/src/main/java/example/EmployeeDao.java b/compile-java-test/src/main/java/example/EmployeeDao.java index 7552fe6..2d94861 100644 --- a/compile-java-test/src/main/java/example/EmployeeDao.java +++ b/compile-java-test/src/main/java/example/EmployeeDao.java @@ -6,9 +6,9 @@ @Dao public interface EmployeeDao { - @Select - Employee selectById(Integer id); + @Select + Employee selectById(Integer id); - @Script - void create(); + @Script + void create(); } diff --git a/compile-java-test/src/test/java/example/GenerationTest.java b/compile-java-test/src/test/java/example/GenerationTest.java index 38edaee..14f0f51 100644 --- a/compile-java-test/src/test/java/example/GenerationTest.java +++ b/compile-java-test/src/test/java/example/GenerationTest.java @@ -1,14 +1,14 @@ package example; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.junit.jupiter.api.Test; + public class GenerationTest { @Test public void test() { assertNotNull(_Employee.class); - assertNotNull(EmployeeDao.class); + assertNotNull(EmployeeDaoImpl.class); } } diff --git a/compile-kotlin-test/build.gradle.kts b/compile-kotlin-test/build.gradle.kts index 71a8916..e7c11a3 100644 --- a/compile-kotlin-test/build.gradle.kts +++ b/compile-kotlin-test/build.gradle.kts @@ -1,31 +1,17 @@ -buildscript { - repositories { - mavenCentral() - mavenLocal() - maven { - url = uri("https://oss.sonatype.org/content/repositories/snapshots/") - } - } - dependencies { - classpath("org.domaframework.doma:compile") - } -} - plugins { - id("java") + java + alias(libs.plugins.kotlin.jvm) + alias(libs.plugins.kotlin.kapt) id("org.domaframework.doma.compile") - id("org.jetbrains.kotlin.jvm") version "2.2.0" - id("org.jetbrains.kotlin.kapt") version "2.2.0" } -val domaVersion = "3.9.1" kapt { includeCompileClasspath = false } java { - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) + toolchain.languageVersion.set(JavaLanguageVersion.of(libs.versions.java.get().toInt())) } tasks { @@ -34,21 +20,13 @@ tasks { } } -repositories { - mavenCentral() - mavenLocal() - maven { - url = uri("https://oss.sonatype.org/content/repositories/snapshots/") - } -} - dependencies { - kapt("org.seasar.doma:doma-processor:$domaVersion") - implementation("org.seasar.doma:doma-core:$domaVersion") - implementation("org.jetbrains.kotlin:kotlin-stdlib") + kapt(libs.doma.processor) + implementation(libs.doma.core) + implementation(libs.kotlin.stdlib) // Use JUnit BOM for version management - testImplementation(platform("org.junit:junit-bom:5.13.2")) - testImplementation("org.junit.jupiter:junit-jupiter-api") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") - testRuntimeOnly("org.junit.platform:junit-platform-launcher") + testImplementation(platform(libs.junit.bom)) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) + testRuntimeOnly(libs.junit.platform.launcher) } diff --git a/compile-kotlin-test/settings.gradle.kts b/compile-kotlin-test/settings.gradle.kts index ddeffa0..77f9792 100644 --- a/compile-kotlin-test/settings.gradle.kts +++ b/compile-kotlin-test/settings.gradle.kts @@ -1,5 +1,9 @@ rootProject.name = "compile-kotlin-test" -pluginManagement { - includeBuild("../compile") +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + from(files("../gradle/libs.versions.toml")) + } + } } diff --git a/compile-kotlin-test/src/test/kotlin/example/GenerationTest.kt b/compile-kotlin-test/src/test/kotlin/example/GenerationTest.kt index e0d3429..d2918e9 100644 --- a/compile-kotlin-test/src/test/kotlin/example/GenerationTest.kt +++ b/compile-kotlin-test/src/test/kotlin/example/GenerationTest.kt @@ -7,6 +7,6 @@ class GenerationTest { @Test fun test() { assertNotNull(_Employee::class.java) - assertNotNull(EmployeeDao::class.java) + assertNotNull(EmployeeDaoImpl::class.java) } } diff --git a/compile-mix-test/build.gradle.kts b/compile-mix-test/build.gradle.kts index d8b5efc..e7c11a3 100644 --- a/compile-mix-test/build.gradle.kts +++ b/compile-mix-test/build.gradle.kts @@ -1,31 +1,17 @@ -buildscript { - repositories { - mavenCentral() - mavenLocal() - maven { - url = uri("https://oss.sonatype.org/content/repositories/snapshots/") - } - } - dependencies { - classpath("org.domaframework.doma:compile") - } -} - plugins { - id("java") + java + alias(libs.plugins.kotlin.jvm) + alias(libs.plugins.kotlin.kapt) id("org.domaframework.doma.compile") - id("org.jetbrains.kotlin.jvm") version "2.2.0" - id("org.jetbrains.kotlin.kapt") version "2.2.0" } -val domaVersion = "3.9.1" kapt { includeCompileClasspath = false } java { - toolchain.languageVersion.set(JavaLanguageVersion.of( 17)) + toolchain.languageVersion.set(JavaLanguageVersion.of(libs.versions.java.get().toInt())) } tasks { @@ -34,21 +20,13 @@ tasks { } } -repositories { - mavenCentral() - mavenLocal() - maven { - url = uri("https://oss.sonatype.org/content/repositories/snapshots/") - } -} - dependencies { - kapt("org.seasar.doma:doma-processor:$domaVersion") - implementation("org.seasar.doma:doma-core:$domaVersion") - implementation("org.jetbrains.kotlin:kotlin-stdlib") + kapt(libs.doma.processor) + implementation(libs.doma.core) + implementation(libs.kotlin.stdlib) // Use JUnit BOM for version management - testImplementation(platform("org.junit:junit-bom:5.13.2")) - testImplementation("org.junit.jupiter:junit-jupiter-api") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") - testRuntimeOnly("org.junit.platform:junit-platform-launcher") + testImplementation(platform(libs.junit.bom)) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) + testRuntimeOnly(libs.junit.platform.launcher) } diff --git a/compile-mix-test/gradle/wrapper/gradle-wrapper.jar b/compile-mix-test/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 490fda8..0000000 Binary files a/compile-mix-test/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/compile-mix-test/gradle/wrapper/gradle-wrapper.properties b/compile-mix-test/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 1e2fbf0..0000000 --- a/compile-mix-test/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/compile-mix-test/gradlew b/compile-mix-test/gradlew deleted file mode 100755 index 2fe81a7..0000000 --- a/compile-mix-test/gradlew +++ /dev/null @@ -1,183 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git a/compile-mix-test/gradlew.bat b/compile-mix-test/gradlew.bat deleted file mode 100644 index 62bd9b9..0000000 --- a/compile-mix-test/gradlew.bat +++ /dev/null @@ -1,103 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/compile-mix-test/settings.gradle.kts b/compile-mix-test/settings.gradle.kts index 5409f11..d1ad7bf 100644 --- a/compile-mix-test/settings.gradle.kts +++ b/compile-mix-test/settings.gradle.kts @@ -1,5 +1,9 @@ rootProject.name = "compile-mix-test" -pluginManagement { - includeBuild("../compile") +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + from(files("../gradle/libs.versions.toml")) + } + } } diff --git a/compile-mix-test/src/main/java/example/Address.java b/compile-mix-test/src/main/java/example/Address.java index b211e45..148092d 100644 --- a/compile-mix-test/src/main/java/example/Address.java +++ b/compile-mix-test/src/main/java/example/Address.java @@ -5,7 +5,6 @@ @Entity class Address { - @Id - public Integer id; - public String name; -} \ No newline at end of file + @Id public Integer id; + public String name; +} diff --git a/compile-mix-test/src/main/java/example/AddressDao.java b/compile-mix-test/src/main/java/example/AddressDao.java index f06a244..1cbe22f 100644 --- a/compile-mix-test/src/main/java/example/AddressDao.java +++ b/compile-mix-test/src/main/java/example/AddressDao.java @@ -1,14 +1,14 @@ package example; import org.seasar.doma.Dao; -import org.seasar.doma.Select; import org.seasar.doma.Script; +import org.seasar.doma.Select; @Dao interface AddressDao { - @Select - Address selectById(Integer id); + @Select + Address selectById(Integer id); - @Script - void create(); -} \ No newline at end of file + @Script + void create(); +} diff --git a/compile-mix-test/src/test/java/example/GenerationTest.java b/compile-mix-test/src/test/java/example/GenerationTest.java index 1d92144..0d95113 100644 --- a/compile-mix-test/src/test/java/example/GenerationTest.java +++ b/compile-mix-test/src/test/java/example/GenerationTest.java @@ -1,16 +1,16 @@ package example; -import org.junit.jupiter.api.Test; - import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.junit.jupiter.api.Test; + public class GenerationTest { @Test public void test() { assertNotNull(_Address.class); assertNotNull(_Employee.class); - assertNotNull(AddressDao.class); - assertNotNull(EmployeeDao.class); + assertNotNull(AddressDaoImpl.class); + assertNotNull(EmployeeDaoImpl.class); } } diff --git a/compile/build.gradle.kts b/compile/build.gradle.kts index 12df354..4653ff3 100644 --- a/compile/build.gradle.kts +++ b/compile/build.gradle.kts @@ -1,8 +1,17 @@ plugins { id("groovy") id("java-gradle-plugin") - id("com.gradle.plugin-publish") version "1.3.1" - id("com.diffplug.spotless") version "7.0.4" + alias(libs.plugins.gradle.plugin.publish) + alias(libs.plugins.spotless) + alias(libs.plugins.release) +} + +configure { + newVersionCommitMessage.set("[Gradle Release Plugin] - [skip ci] new version commit: ") + tagTemplate.set("v\$version") + git { + requireBranch.set("master") + } } gradlePlugin { @@ -32,12 +41,12 @@ sourceSets { spotless { java { - googleJavaFormat("1.23.0") + googleJavaFormat(libs.versions.google.java.format.get()) } } java { - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) + toolchain.languageVersion.set(JavaLanguageVersion.of(libs.versions.java.get().toInt())) } repositories { @@ -46,10 +55,10 @@ repositories { dependencies { // Use JUnit BOM for version management - testImplementation(platform("org.junit:junit-bom:5.13.2")) - testImplementation("org.junit.jupiter:junit-jupiter-api") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") - testRuntimeOnly("org.junit.platform:junit-platform-launcher") + testImplementation(platform(libs.junit.bom)) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) + testRuntimeOnly(libs.junit.platform.launcher) } tasks { diff --git a/compile-kotlin-test/gradle/wrapper/gradle-wrapper.jar b/compile/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from compile-kotlin-test/gradle/wrapper/gradle-wrapper.jar rename to compile/gradle/wrapper/gradle-wrapper.jar diff --git a/compile-kotlin-test/gradle/wrapper/gradle-wrapper.properties b/compile/gradle/wrapper/gradle-wrapper.properties similarity index 79% rename from compile-kotlin-test/gradle/wrapper/gradle-wrapper.properties rename to compile/gradle/wrapper/gradle-wrapper.properties index 1e2fbf0..685b0c7 100644 --- a/compile-kotlin-test/gradle/wrapper/gradle-wrapper.properties +++ b/compile/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Tue Mar 31 22:12:05 JST 2020 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/compile-kotlin-test/gradlew b/compile/gradlew similarity index 100% rename from compile-kotlin-test/gradlew rename to compile/gradlew diff --git a/compile-kotlin-test/gradlew.bat b/compile/gradlew.bat similarity index 100% rename from compile-kotlin-test/gradlew.bat rename to compile/gradlew.bat diff --git a/compile/settings.gradle.kts b/compile/settings.gradle.kts index ec8b40f..71dc2b4 100644 --- a/compile/settings.gradle.kts +++ b/compile/settings.gradle.kts @@ -1 +1,9 @@ rootProject.name = "compile" + +dependencyResolutionManagement { + versionCatalogs { + create("libs") { + from(files("../gradle/libs.versions.toml")) + } + } +} diff --git a/gradle.properties b/gradle.properties index c66360d..8238046 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,6 @@ group=org.domaframework.doma version=4.0.1-SNAPSHOT release.useAutomaticVersion=true +org.gradle.parallel=true +org.gradle.caching=true +org.gradle.jvmargs=-Xmx2048M diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..00d0d60 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,25 @@ +[versions] +doma = "3.9.1" +junit-bom = "5.13.2" +kotlin = "2.2.0" +gradle-plugin-publish = "1.3.1" +spotless = "7.0.4" +release = "3.1.0" +google-java-format = "1.23.0" +java = "17" + +[libraries] +doma-core = { module = "org.seasar.doma:doma-core", version.ref = "doma" } +doma-processor = { module = "org.seasar.doma:doma-processor", version.ref = "doma" } +junit-bom = { module = "org.junit:junit-bom", version.ref = "junit-bom" } +junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api" } +junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" } +junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" } +kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib" } + +[plugins] +kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } +gradle-plugin-publish = { id = "com.gradle.plugin-publish", version.ref = "gradle-plugin-publish" } +spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } +release = { id = "net.researchgate.release", version.ref = "release" } \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index ecb7aba..348e327 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,2 +1,9 @@ rootProject.name = "doma-compile-plugin" -include("compile") + +pluginManagement { + includeBuild("compile") +} + +include("compile-java-test") +include("compile-kotlin-test") +include("compile-mix-test")