[Gradle Release Plugin] - pre tag commit: '2.30.0'.

nakamura-to · nakamura-to · commit 1982603f6bf3 · 2020-04-18T08:30:08.000+09:00
diff --git a/README.md b/README.md
@@ -57,8 +57,8 @@ Build with Gradle
 
 ```groovy
 dependencies {
-    implementation "org.seasar.doma:doma-core:2.30.0-beta-5-SNAPSHOT"
-    annotationProcessor "org.seasar.doma:doma-processor:2.30.0-beta-5-SNAPSHOT"
+    implementation "org.seasar.doma:doma-core:2.30.0-beta-6-SNAPSHOT"
+    annotationProcessor "org.seasar.doma:doma-processor:2.30.0-beta-6-SNAPSHOT"
 }
 ```
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -64,7 +64,7 @@ subprojects {
         (options as StandardJavadocDocletOptions).apply {
             charSet = encoding
             docEncoding = encoding
-            links("https://docs.oracle.com/javase/jp/8/docs/api/")
+            links("https://docs.oracle.com/javase/8/docs/api/")
             use()
             exclude("**/internal/**")
         }
@@ -87,8 +87,8 @@ subprojects {
     }
 
     dependencies {
-        "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.4.0")
-        "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.4.0")
+        "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.6.2")
+        "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.6.2")
     }
 
     configure<JavaPluginExtension> {
diff --git a/docs/annotation-processing.rst b/docs/annotation-processing.rst
@@ -74,8 +74,8 @@ doma.config.path
 Setting options in Gradle
 =========================
 
-- Use `the compilerArgs property
-  <https://docs.gradle.org/5.0/dsl/org.gradle.api.tasks.compile.CompileOptions.html#org.gradle.api.tasks.compile.CompileOptions:compilerArgs>`_
+Use `the compilerArgs property
+<https://docs.gradle.org/5.0/dsl/org.gradle.api.tasks.compile.CompileOptions.html#org.gradle.api.tasks.compile.CompileOptions:compilerArgs>`_:
 
 .. code-block:: groovy
 
@@ -94,8 +94,25 @@ In the case, the options written in build.gradle are used.
 Setting options in Eclipse
 ==========================
 
-Generate eclipse setting files
-by using the Gradle plugin `com.diffplug.eclipse.apt<https://plugins.gradle.org/plugin/com.diffplug.eclipse.apt>`_.
+Use the Gradle plugin `com.diffplug.eclipse.apt
+<https://plugins.gradle.org/plugin/com.diffplug.eclipse.apt>`_
+and the processorArgs property:
+
+.. code-block:: groovy
+
+  plugins {
+      id 'com.diffplug.eclipse.apt' version '3.22.0'
+  }
+
+  compileJava {
+    aptOptions {
+      processorArgs = [
+        'doma.dao.subpackage' : 'impl', 'doma.dao.suffix' : 'Impl'
+      ]
+    }
+  }
+
+When you run ``gradle eclipse``, eclipse setting files are generated.
 
 Setting options with configuration file
 =======================================
diff --git a/docs/build.rst b/docs/build.rst
@@ -35,8 +35,8 @@ Write your build.gradle as follows:
 .. code-block:: groovy
 
   dependencies {
-      implementation "org.seasar.doma:doma-core:2.30.0-beta-5-SNAPSHOT"
-      annotationProcessor "org.seasar.doma:doma-processor:2.30.0-beta-5-SNAPSHOT"
+      implementation "org.seasar.doma:doma-core:2.30.0-beta-6-SNAPSHOT"
+      annotationProcessor "org.seasar.doma:doma-processor:2.30.0-beta-6-SNAPSHOT"
   }
 
 To simplify your build.script, we recommend that you use the `Doma Compile Plugin`_.
diff --git a/docs/development.rst b/docs/development.rst
@@ -33,7 +33,7 @@ Build from the Command Line
 Format the Source Code
 ======================
 
-We use `google-java-format`_ 1.6 for code formatting.
+We use `google-java-format`_ 1.7 for code formatting.
 
 Command Line
 ------------
diff --git a/docs/kotlin-support.rst b/docs/kotlin-support.rst
@@ -99,8 +99,8 @@ Add the dependencies using the `kapt` and `implementation` configuration in your
 .. code-block:: groovy
 
   dependencies {
-      implementation "org.seasar.doma:doma-core:2.30.0-beta-5-SNAPSHOT"
-      kapt "org.seasar.doma:doma-processor:2.30.0-beta-5-SNAPSHOT"
+      implementation "org.seasar.doma:doma-core:2.30.0-beta-6-SNAPSHOT"
+      kapt "org.seasar.doma:doma-processor:2.30.0-beta-6-SNAPSHOT"
   }
 
 To simplify your build.script, we recommend you use
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
@@ -2,6 +2,26 @@
 Release notes
 =============
 
+v2.30.0: 2020-04-18
+======================
+
+See also `Migration Guide <https://github.com/domaframework/doma/wiki/Migration-Guide-for-Doma-2.30.0>`_.
+
+* `GH374 <https://github.com/domaframework/doma/pull/374>`_
+  Upgrade Gradle and JUnit
+* `GH371 <https://github.com/domaframework/doma/pull/371>`_
+  Set new version number to the Artifact.java file
+* `GH368 <https://github.com/domaframework/doma/pull/368>`_
+  Correct the path of secretKeyRingFile
+* `GH364 <https://github.com/domaframework/doma/pull/364>`_
+  Split a project in two
+* `GH363 <https://github.com/domaframework/doma/pull/363>`_
+  Support Kotlin's default methods
+* `GH361 <https://github.com/domaframework/doma/pull/361>`_
+  Use the nexus publish plugin
+* `GH360 <https://github.com/domaframework/doma/pull/360>`_
+  Provide a new artifact "doma-processor"
+
 v2.29.0: 2020-04-05
 ======================
 
diff --git a/doma-core/src/main/java/org/seasar/doma/internal/Artifact.java b/doma-core/src/main/java/org/seasar/doma/internal/Artifact.java
@@ -7,7 +7,7 @@ public final class Artifact {
 
   private static final String NAME = "Doma";
 
-  private static final String VERSION = "2.30.0-beta-5-SNAPSHOT";
+  private static final String VERSION = "2.30.0-beta-6-SNAPSHOT";
 
   public static String getName() {
     return NAME;
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group=org.seasar.doma
-version=2.30.0-beta-5
+version=2.30.0
 encoding=UTF-8
 systemProp.org.gradle.internal.publish.checksums.insecure=true
 projectUrl=https://github.com/domaframework/doma
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Tue Apr 07 17:29:14 JST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -1,5 +1,21 @@
 #!/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
@@ -28,7 +44,7 @@ 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"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# 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"`
@@ -138,19 +154,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        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" ;;
+        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
 
@@ -159,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+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"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
@@ -1,3 +1,19 @@
+@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
@@ -13,8 +29,11 @@ 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"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,8 @@ Build with Gradle`
`57`	`57`
`58`	`58`	```groovy
`59`	`59`	`dependencies {`
`60`		`- implementation "org.seasar.doma:doma-core:2.30.0-beta-5-SNAPSHOT"`
`61`		`- annotationProcessor "org.seasar.doma:doma-processor:2.30.0-beta-5-SNAPSHOT"`
	`60`	`+ implementation "org.seasar.doma:doma-core:2.30.0-beta-6-SNAPSHOT"`
	`61`	`+ annotationProcessor "org.seasar.doma:doma-processor:2.30.0-beta-6-SNAPSHOT"`
`62`	`62`	`}`
`63`	`63`	```
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ subprojects {`
`64`	`64`	`(options as StandardJavadocDocletOptions).apply {`
`65`	`65`	`charSet = encoding`
`66`	`66`	`docEncoding = encoding`
`67`		`- links("https://docs.oracle.com/javase/jp/8/docs/api/")`
	`67`	`+ links("https://docs.oracle.com/javase/8/docs/api/")`
`68`	`68`	`use()`
`69`	`69`	`exclude("/internal/")`
`70`	`70`	`}`
`@@ -87,8 +87,8 @@ subprojects {`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`dependencies {`
`90`		`- "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.4.0")`
`91`		`- "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.4.0")`
	`90`	`+ "testImplementation"("org.junit.jupiter:junit-jupiter-api:5.6.2")`
	`91`	`+ "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:5.6.2")`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`configure<JavaPluginExtension> {`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ Write your build.gradle as follows:`
`35`	`35`	`.. code-block:: groovy`
`36`	`36`
`37`	`37`	`dependencies {`
`38`		`- implementation "org.seasar.doma:doma-core:2.30.0-beta-5-SNAPSHOT"`
`39`		`- annotationProcessor "org.seasar.doma:doma-processor:2.30.0-beta-5-SNAPSHOT"`
	`38`	`+ implementation "org.seasar.doma:doma-core:2.30.0-beta-6-SNAPSHOT"`
	`39`	`+ annotationProcessor "org.seasar.doma:doma-processor:2.30.0-beta-6-SNAPSHOT"`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	To simplify your build.script, we recommend that you use the `Doma Compile Plugin`_.
Original file line number	Diff line number	Diff line change
@@ -99,8 +99,8 @@ Add the dependencies using the `kapt` and `implementation` configuration in your
`99`	`99`	`.. code-block:: groovy`
`100`	`100`
`101`	`101`	`dependencies {`
`102`		`- implementation "org.seasar.doma:doma-core:2.30.0-beta-5-SNAPSHOT"`
`103`		`- kapt "org.seasar.doma:doma-processor:2.30.0-beta-5-SNAPSHOT"`
	`102`	`+ implementation "org.seasar.doma:doma-core:2.30.0-beta-6-SNAPSHOT"`
	`103`	`+ kapt "org.seasar.doma:doma-processor:2.30.0-beta-6-SNAPSHOT"`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`To simplify your build.script, we recommend you use`