Skip to content

Commit

Permalink
Release Doma 3 (#21)
Browse files Browse the repository at this point in the history
* Update versions

* Update the description related to the getting-started sample project.

* Update Java versions

* Update po files
  • Loading branch information
nakamura-to authored Sep 1, 2024
1 parent 713136c commit 6bb77da
Show file tree
Hide file tree
Showing 14 changed files with 85 additions and 101 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
val domaVersion = "2.60.0"
val domaVersion = "3.0.0"

fun updateVersion() {
// Gradle
Expand Down
4 changes: 2 additions & 2 deletions docs/annotation-processing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ Use `the compilerArgs parameter
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source> <!-- depending on your project -->
<target>1.8</target> <!-- depending on your project -->
<source>17</source> <!-- depending on your project -->
<target>17</target> <!-- depending on your project -->
<annotationProcessorPaths>
<path>
<groupId>org.seasar.doma</groupId>
Expand Down
14 changes: 7 additions & 7 deletions docs/build.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ Write your build.gradle(.kts) as follows:
}
dependencies {
implementation("org.seasar.doma:doma-core:2.60.0")
annotationProcessor("org.seasar.doma:doma-processor:2.60.0")
implementation("org.seasar.doma:doma-core:3.0.0")
annotationProcessor("org.seasar.doma:doma-processor:3.0.0")
}
.. tab:: Groovy
Expand All @@ -53,8 +53,8 @@ Write your build.gradle(.kts) as follows:
}
dependencies {
implementation 'org.seasar.doma:doma-core:2.60.0'
annotationProcessor 'org.seasar.doma:doma-processor:2.60.0'
implementation 'org.seasar.doma:doma-core:3.0.0'
annotationProcessor 'org.seasar.doma:doma-processor:3.0.0'
}
To simplify your build.script(.kts), we recommend that you use the `org.seasar.doma.compile`_ plugin.
Expand All @@ -72,7 +72,7 @@ Write your pom.xml as follows:
...
<properties>
<doma.version>2.60.0</doma.version>
<doma.version>3.0.0</doma.version>
</properties>
...
<dependencies>
Expand All @@ -90,8 +90,8 @@ Write your pom.xml as follows:
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source> <!-- depending on your project -->
<target>1.8</target> <!-- depending on your project -->
<source>17</source> <!-- depending on your project -->
<target>17</target> <!-- depending on your project -->
<annotationProcessorPaths>
<path>
<groupId>org.seasar.doma</groupId>
Expand Down
4 changes: 2 additions & 2 deletions docs/faq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Runtime environment
Which version of JRE does Doma support?
---------------------------------------

JRE 8 and above.
JRE 17 and above.

Which libraries are required for Doma to work?
----------------------------------------------
Expand All @@ -48,7 +48,7 @@ Development environment
Which version of JDK does Doma support?
---------------------------------------

JDK 8 and above.
JDK 17 and above.

Which IDE do you recommend?
---------------------------
Expand Down
12 changes: 2 additions & 10 deletions docs/getting-started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@ Install JDK

To begin, JDK 17 is required.

.. note::

It's important to note that Doma is compatible with JDK 8 onwards.
For details on supported JDK versions, refer to the appropriate section.
:ref:`Which version of JDK does Doma support?<which-version-of-jdk-does-doma-support>`.

Get sample project
==================

Expand All @@ -45,10 +39,8 @@ Ensure successful project setup with:
Sample project structure
========================

The getting-started sample is a Gradle multi-project consisting of java-8 and java-17 sub-projects.
Both are similar, with the primary difference being how SQL statements are stored: in files for java-8 and as Text Blocks in java-17.

This guide will focus on the java-17 project.
The getting-started sample is a Gradle multi-project that includes a java-17 subproject.
This guide will focus on the java-17 subproject.

Import project to your IDE
==========================
Expand Down
4 changes: 2 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
:align: right
:target: https://github.com/domaframework/doma

Welcome to Doma 2
Welcome to Doma
=====================

Doma 2 is a database access framework for Java 8+.
Doma is a database access framework for Java.
Doma has various strengths:

* Verifies and generates source code at compile time using annotation processing.
Expand Down
6 changes: 3 additions & 3 deletions docs/kotlin-support.rst
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ You can write build.gradle.kts as follows:
.. code-block:: kotlin
dependencies {
implementation("org.seasar.doma:doma-kotlin:2.60.0")
implementation("org.seasar.doma:doma-kotlin:3.0.0")
}
Code Generation
Expand All @@ -173,8 +173,8 @@ For example, you can write build.gradle.kts as follows:
.. code-block:: kotlin
dependencies {
kapt("org.seasar.doma:doma-processor:2.60.0")
implementation("org.seasar.doma:doma-kotlin:2.60.0")
kapt("org.seasar.doma:doma-processor:3.0.0")
implementation("org.seasar.doma:doma-kotlin:3.0.0")
}
To simplify your build script, we recommend you use
Expand Down
2 changes: 1 addition & 1 deletion docs/locale/ja/LC_MESSAGES/criteria-api.po
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ msgstr "次の例を参照してください。"

#: ../../criteria-api.rst:235
msgid "Both (1) and (2) issue the same SQL statement as follows:"
msgstr "(1) と (2) は両方とも、次のように同じ SQL ステートメントを発行します。"
msgstr "(1) と (2) の両方とも、以下のように同じ SQL ステートメントを発行します。"

#: ../../criteria-api.rst:243
msgid "The ResultSet contains 14 rows, but the Entityql DSL returns only 3 rows because it removes duplicate Department entities. The Entityql DSL uses the id properties to know the uniqueness of the entities."
Expand Down
10 changes: 5 additions & 5 deletions docs/locale/ja/LC_MESSAGES/faq.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: doma-docs\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-03-17 13:53+0000\n"
"POT-Creation-Date: 2024-09-01 09:20+0900\n"
"Last-Translator: \n"
"Language-Team: Japanese\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -68,8 +68,8 @@ msgid "Which version of JRE does Doma support?"
msgstr "Doma はどのバージョンの JRE をサポートしていますか?"

#: ../../faq.rst:34
msgid "JRE 8 and above."
msgstr "JRE 8以降です。"
msgid "JRE 17 and above."
msgstr "JRE 17以降です。"

#: ../../faq.rst:37
msgid "Which libraries are required for Doma to work?"
Expand All @@ -92,8 +92,8 @@ msgid "Which version of JDK does Doma support?"
msgstr "Doma はどのバージョンの JDK をサポートしていますか?"

#: ../../faq.rst:51
msgid "JDK 8 and above."
msgstr "JDK 8以降です。"
msgid "JDK 17 and above."
msgstr "JDK 17以降です。"

#: ../../faq.rst:54
msgid "Which IDE do you recommend?"
Expand Down
Loading

0 comments on commit 6bb77da

Please sign in to comment.