diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8d866b6..2bdfc81 100644 --- a/.github/workflows/ci.yml +++ b/.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,7 +49,6 @@ 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 @@ -62,5 +56,4 @@ jobs: - 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 }} diff --git a/.gitignore b/.gitignore index 927d671..be3c74e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,3 @@ /.metadata /.idea/ .factorypath -.sdkmanrc diff --git a/.sdkmanrc b/.sdkmanrc new file mode 100644 index 0000000..9402662 --- /dev/null +++ b/.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 + diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..d30b209 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,21 @@ +plugins { + java + id("net.researchgate.release") version "3.0.2" +} + +configure { + 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() + } + } +} diff --git a/compile-java-test/build.gradle b/compile-java-test/build.gradle index be28044..d25fabb 100644 --- a/compile-java-test/build.gradle +++ b/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' } \ No newline at end of file diff --git a/compile-java-test/gradle/wrapper/gradle-wrapper.properties b/compile-java-test/gradle/wrapper/gradle-wrapper.properties index 44e7c4d..1e2fbf0 100644 --- a/compile-java-test/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/compile-kotlin-test/build.gradle b/compile-kotlin-test/build.gradle index a278e99..7c4aff4 100644 --- a/compile-kotlin-test/build.gradle +++ b/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' diff --git a/compile-kotlin-test/gradle/wrapper/gradle-wrapper.properties b/compile-kotlin-test/gradle/wrapper/gradle-wrapper.properties index 4d9ca16..1e2fbf0 100644 --- a/compile-kotlin-test/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/compile-mix-test/build.gradle b/compile-mix-test/build.gradle index be263bb..daa9d40 100644 --- a/compile-mix-test/build.gradle +++ b/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' diff --git a/compile-mix-test/gradle/wrapper/gradle-wrapper.properties b/compile-mix-test/gradle/wrapper/gradle-wrapper.properties index 4d9ca16..1e2fbf0 100644 --- a/compile-mix-test/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/compile/build.gradle b/compile/build.gradle deleted file mode 100644 index d3cd188..0000000 --- a/compile/build.gradle +++ /dev/null @@ -1,60 +0,0 @@ -plugins { - id 'groovy' - id 'java-gradle-plugin' - id 'com.gradle.plugin-publish' version '1.3.0' - id 'com.diffplug.gradle.spotless' version '3.30.0' -} - -gradlePlugin { - plugins { - compilePlugin { - id = 'org.domaframework.doma.compile' - displayName = 'Doma Compile Plugin' - description = 'Allows annotation processors to read Doma resources at compile-time' - implementationClass = 'org.seasar.doma.gradle.compile.CompilePlugin' - } - } -} - -pluginBundle { - website = 'https://github.com/domaframework/doma-compile-plugin' - vcsUrl = 'https://github.com/domaframework/doma-compile-plugin.git' - tags = ['doma', 'compile', 'annotation-processing'] -} - -sourceSets { - main { - java { - srcDirs = [] - } - groovy { - srcDirs = ['src/main/groovy', 'src/main/java'] - } - } -} - -spotless { - java { - googleJavaFormat('1.7') - } -} - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - -test { - useJUnitPlatform() -} - -repositories { - mavenCentral() -} - -dependencies { - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.1' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.1' -} - -groovydoc.enabled = false diff --git a/compile/build.gradle.kts b/compile/build.gradle.kts new file mode 100644 index 0000000..02ded55 --- /dev/null +++ b/compile/build.gradle.kts @@ -0,0 +1,68 @@ +plugins { + id("groovy") + id("java-gradle-plugin") + id("com.gradle.plugin-publish") version "1.3.0" + id("com.diffplug.spotless") version "6.25.0" +} + +gradlePlugin { + website.set("https://github.com/domaframework/doma-compile-plugin") + vcsUrl.set("https://github.com/domaframework/doma-compile-plugin.git") + plugins { + create("compilePlugin") { + id = "org.domaframework.doma.compile" + displayName = "Doma Compile Plugin" + description = "Allows annotation processors to read Doma resources at compile-time" + implementationClass = "org.seasar.doma.gradle.compile.CompilePlugin" + tags.set(listOf("doma", "compile", "annotation-processing")) + } + } +} + +sourceSets { + main { + java { + setSrcDirs(emptyList()) + } + groovy { + setSrcDirs(listOf("src/main/groovy", "src/main/java")) + } + } +} + +spotless { + java { + googleJavaFormat("1.23.0") + } +} + +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(17)) +} + +repositories { + mavenCentral() +} + +dependencies { + testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.1") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.1") +} + +tasks { + test { + useJUnitPlatform() + } + + javadoc { + enabled = false + } + + groovydoc { + enabled = false + } + + build { + dependsOn(spotlessApply) + } +} diff --git a/compile/gradle.properties b/compile/gradle.properties index db78549..dc76bbb 100644 --- a/compile/gradle.properties +++ b/compile/gradle.properties @@ -1,2 +1 @@ group=org.domaframework.doma -version=2.0.1-SNAPSHOT diff --git a/compile/gradle/wrapper/gradle-wrapper.jar b/compile/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index f3d88b1..0000000 Binary files a/compile/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/compile/gradle/wrapper/gradle-wrapper.properties b/compile/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 44e7c4d..0000000 --- a/compile/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-5.2.1-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/compile/gradlew b/compile/gradlew deleted file mode 100755 index 2fe81a7..0000000 --- a/compile/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/gradlew.bat b/compile/gradlew.bat deleted file mode 100644 index 62bd9b9..0000000 --- a/compile/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/settings.gradle b/compile/settings.gradle deleted file mode 100644 index 522a8ce..0000000 --- a/compile/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'compile' diff --git a/compile/settings.gradle.kts b/compile/settings.gradle.kts new file mode 100644 index 0000000..ec8b40f --- /dev/null +++ b/compile/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "compile" diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..660300b --- /dev/null +++ b/gradle.properties @@ -0,0 +1,3 @@ +group=org.domaframework.doma +version=2.0.1-SNAPSHOT +release.useAutomaticVersion=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6a14dfc..685b0c7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ #Tue Mar 31 22:12:05 JST 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 867a417..0000000 --- a/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = 'doma-compile-plugin' -include 'compile' diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..ecb7aba --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,2 @@ +rootProject.name = "doma-compile-plugin" +include("compile")