Skip to content

Commit 3e469f8

Browse files
authored
Merge pull request #375 from domaframework/prepare-for-release
Prepare for release
2 parents 2d6b531 + 6a3014d commit 3e469f8

File tree

4 files changed

+43
-6
lines changed

4 files changed

+43
-6
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ subprojects {
6464
(options as StandardJavadocDocletOptions).apply {
6565
charSet = encoding
6666
docEncoding = encoding
67-
links("https://docs.oracle.com/javase/jp/8/docs/api/")
67+
links("https://docs.oracle.com/javase/8/docs/api/")
6868
use()
6969
exclude("**/internal/**")
7070
}

docs/annotation-processing.rst

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ doma.config.path
7474
Setting options in Gradle
7575
=========================
7676

77-
- Use `the compilerArgs property
78-
<https://docs.gradle.org/5.0/dsl/org.gradle.api.tasks.compile.CompileOptions.html#org.gradle.api.tasks.compile.CompileOptions:compilerArgs>`_
77+
Use `the compilerArgs property
78+
<https://docs.gradle.org/5.0/dsl/org.gradle.api.tasks.compile.CompileOptions.html#org.gradle.api.tasks.compile.CompileOptions:compilerArgs>`_:
7979

8080
.. code-block:: groovy
8181
@@ -94,8 +94,25 @@ In the case, the options written in build.gradle are used.
9494
Setting options in Eclipse
9595
==========================
9696

97-
Generate eclipse setting files
98-
by using the Gradle plugin `com.diffplug.eclipse.apt<https://plugins.gradle.org/plugin/com.diffplug.eclipse.apt>`_.
97+
Use the Gradle plugin `com.diffplug.eclipse.apt
98+
<https://plugins.gradle.org/plugin/com.diffplug.eclipse.apt>`_
99+
and the processorArgs property:
100+
101+
.. code-block:: groovy
102+
103+
plugins {
104+
id 'com.diffplug.eclipse.apt' version '3.22.0'
105+
}
106+
107+
compileJava {
108+
aptOptions {
109+
processorArgs = [
110+
'doma.dao.subpackage' : 'impl', 'doma.dao.suffix' : 'Impl'
111+
]
112+
}
113+
}
114+
115+
When you run ``gradle eclipse``, eclipse setting files are generated.
99116

100117
Setting options with configuration file
101118
=======================================

docs/development.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Build from the Command Line
3333
Format the Source Code
3434
======================
3535

36-
We use `google-java-format`_ 1.6 for code formatting.
36+
We use `google-java-format`_ 1.7 for code formatting.
3737

3838
Command Line
3939
------------

docs/release-notes.rst

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,26 @@
22
Release notes
33
=============
44

5+
v2.30.0: 2020-04-18
6+
======================
7+
8+
See also `Migration Guide <https://github.com/domaframework/doma/wiki/Migration-Guide-for-Doma-2.30.0>`_.
9+
10+
* `GH374 <https://github.com/domaframework/doma/pull/374>`_
11+
Upgrade Gradle and JUnit
12+
* `GH371 <https://github.com/domaframework/doma/pull/371>`_
13+
Set new version number to the Artifact.java file
14+
* `GH368 <https://github.com/domaframework/doma/pull/368>`_
15+
Correct the path of secretKeyRingFile
16+
* `GH364 <https://github.com/domaframework/doma/pull/364>`_
17+
Split a project in two
18+
* `GH363 <https://github.com/domaframework/doma/pull/363>`_
19+
Support Kotlin's default methods
20+
* `GH361 <https://github.com/domaframework/doma/pull/361>`_
21+
Use the nexus publish plugin
22+
* `GH360 <https://github.com/domaframework/doma/pull/360>`_
23+
Provide a new artifact "doma-processor"
24+
525
v2.29.0: 2020-04-05
626
======================
727

0 commit comments

Comments
 (0)