Skip to content

Commit 5be8699

Browse files
nakamura-tonakamura-to
committed
[Gradle Release Plugin] - pre tag commit: '2.39.0'.
2 parents 3a60c0c + 668a8fa commit 5be8699

File tree

91 files changed

+410
-747
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+410
-747
lines changed

‎.github/pr-labeler.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
chore: chore/*
2+
ci: ci/*
3+
dependencies: dependencies/*
4+
docs: docs/*
5+
feature: ['feature/*', 'feat/*']
6+
fix: fix/*
7+
perf: perf/*
8+
refactor: refactor/*
9+
skip-changelog: ['release', 'working']
10+
test: test/*

‎.github/release-drafter.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name-template: '$RESOLVED_VERSION'
2+
tag-template: '$RESOLVED_VERSION'
3+
template: |
4+
# What's Changed
5+
6+
$CHANGES
7+
categories:
8+
- title: 'New Features'
9+
labels:
10+
- 'feat'
11+
- 'feature'
12+
- title: 'Bug Fixes'
13+
labels:
14+
- 'bug'
15+
- 'fix'
16+
- title: 'Maintenance'
17+
label:
18+
- 'ci'
19+
- 'chore'
20+
- 'perf'
21+
- 'refactor'
22+
- 'test'
23+
- title: 'Documentation'
24+
label: 'docs'
25+
- title: 'Dependency Upgrades'
26+
label: 'dependencies'
27+
exclude-labels:
28+
- 'skip-changelog'
29+
version-resolver:
30+
major:
31+
labels:
32+
- 'major'
33+
minor:
34+
labels:
35+
- 'minor'
36+
- 'feat'
37+
- 'feature'
38+
patch:
39+
labels:
40+
- 'patch'
41+
default: patch

‎.github/workflows/ci.yml‎

Lines changed: 189 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,189 @@
1+
name: Java CI with Gradle
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
workflow_dispatch:
9+
10+
jobs:
11+
build:
12+
if: contains(toJSON(github.event.commits.*.message), '[skip ci]') == false
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- uses: actions/checkout@v2
17+
18+
- name: Set up JDK 8
19+
uses: actions/setup-java@v1
20+
with:
21+
java-version: 8
22+
23+
- name: Grant execute permission for gradlew
24+
run: chmod +x gradlew
25+
26+
- name: Cache Gradle packages
27+
uses: actions/cache@v2
28+
with:
29+
path: ~/.gradle/caches
30+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('**/*.gradle') }}
31+
restore-keys: ${{ runner.os }}-gradle
32+
33+
- name: Build with Gradle
34+
run: ./gradlew assemble check
35+
36+
- name: Upload reports
37+
if: always()
38+
uses: actions/upload-artifact@v2
39+
with:
40+
name: reports (build)
41+
path: |
42+
doma-core/build/reports
43+
doma-processor/build/reports
44+
test-criteria/build/reports
45+
46+
integration-test:
47+
if: contains(toJSON(github.event.commits.*.message), '[skip ci]') == false
48+
name: JDK ${{ matrix.java }} and ${{ matrix.db }}
49+
runs-on: ubuntu-latest
50+
51+
strategy:
52+
matrix:
53+
java: [ 8, 11, 14 ]
54+
db: [ h2, postgres, mysql ]
55+
56+
services:
57+
postgres:
58+
image: postgres:10.5
59+
env:
60+
POSTGRES_USER: postgres
61+
POSTGRES_PASSWORD: postgres
62+
POSTGRES_DB: doma_it
63+
ports:
64+
- 127.0.0.1:5432:5432
65+
mysql:
66+
image: mysql:5.7
67+
env:
68+
MYSQL_ROOT_PASSWORD: root
69+
MYSQL_DATABASE: doma_it
70+
ports:
71+
- 3306
72+
73+
steps:
74+
- name: Start the MySQL service
75+
if: matrix.db == 'mysql'
76+
run: |
77+
sudo /etc/init.d/mysql start
78+
mysql -uroot -h127.0.0.1 -proot -e 'create database doma_it;'
79+
80+
- name: Checkout (doma)
81+
uses: actions/checkout@v2
82+
with:
83+
path: doma
84+
85+
- name: Set up JDK (doma)
86+
uses: actions/setup-java@v1
87+
with:
88+
java-version: 8
89+
90+
- name: Grant execute permission for gradlew (doma)
91+
working-directory: ./doma
92+
run: chmod +x gradlew
93+
94+
- name: Build with Gradle (doma)
95+
working-directory: ./doma
96+
run: ./gradlew build -x check
97+
98+
- name: Checkout (doma-it)
99+
uses: actions/checkout@v2
100+
with:
101+
repository: domaframework/doma-it
102+
path: doma-it
103+
104+
- name: Set up JDK (doma-it)
105+
uses: actions/setup-java@v1
106+
with:
107+
java-version: ${{ matrix.java }}
108+
109+
- name: Grant execute permission for gradlew (doma-it)
110+
working-directory: ./doma-it
111+
run: chmod +x gradlew
112+
113+
- name: Build with Gradle (doma-it)
114+
working-directory: ./doma-it
115+
run: ./gradlew assemble
116+
117+
- name: Test with h2 (doma-it)
118+
if: matrix.db == 'h2'
119+
working-directory: ./doma-it
120+
run: ./gradlew check -s
121+
env:
122+
ORG_GRADLE_PROJECT_jdbcUrl: ''
123+
ORG_GRADLE_PROJECT_jdbcUser: ''
124+
ORG_GRADLE_PROJECT_jdbcPassword: ''
125+
126+
- name: Test with postgres (doma-it)
127+
if: matrix.db == 'postgres'
128+
working-directory: ./doma-it
129+
run: ./gradlew check -s
130+
env:
131+
ORG_GRADLE_PROJECT_jdbcUrl: jdbc:postgresql://127.0.0.1/doma_it
132+
ORG_GRADLE_PROJECT_jdbcUser: postgres
133+
ORG_GRADLE_PROJECT_jdbcPassword: postgres
134+
135+
- name: Test with mysql (doma-it)
136+
if: matrix.db == 'mysql'
137+
working-directory: ./doma-it
138+
run: ./gradlew check -s
139+
env:
140+
ORG_GRADLE_PROJECT_jdbcUrl: jdbc:mysql://127.0.0.1/doma_it
141+
ORG_GRADLE_PROJECT_jdbcUser: root
142+
ORG_GRADLE_PROJECT_jdbcPassword: root
143+
144+
- name: Upload reports (doma-it)
145+
if: always()
146+
uses: actions/upload-artifact@v1
147+
with:
148+
name: jdk${{ matrix.java }}-${{ matrix.db }}
149+
path: ./doma-it/build/reports
150+
151+
publish:
152+
if: github.event_name == 'push' && contains(toJSON(github.event.commits.*.message), '[skip ci]') == false
153+
needs: [build, integration-test]
154+
runs-on: ubuntu-latest
155+
156+
steps:
157+
- uses: actions/checkout@v2
158+
159+
- name: Set up JDK 8
160+
uses: actions/setup-java@v1
161+
with:
162+
java-version: 8
163+
164+
- name: Grant execute permission for gradlew
165+
run: chmod +x gradlew
166+
167+
- name: Cache Gradle packages
168+
uses: actions/cache@v2
169+
with:
170+
path: ~/.gradle/caches
171+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}-${{ hashFiles('**/*.gradle') }}
172+
restore-keys: ${{ runner.os }}-gradle
173+
174+
- name: Publish packages
175+
run: ./gradlew build publish
176+
env:
177+
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
178+
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
179+
ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.OSSRH_USERNAME }}
180+
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_PASSWORD }}
181+
182+
- name: Upload reports
183+
if: always()
184+
uses: actions/upload-artifact@v2
185+
with:
186+
name: reports (publish)
187+
path: |
188+
doma-core/build/reports
189+
doma-processor/build/reports

‎.github/workflows/pr-labeler.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: PR Labeler
2+
3+
on:
4+
pull_request:
5+
types: [opened]
6+
7+
jobs:
8+
pr-labeler:
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- uses: TimonVS/pr-labeler-action@v3
13+
with:
14+
configuration-path: .github/pr-labeler.yml
15+
env:
16+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/release-drafter.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Release Drafter
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
update_release_draft:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: release-drafter/release-drafter@v5
14+
env:
15+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.travis.yml‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Doma [![Build Status](https://travis-ci.org/domaframework/doma.svg?branch=master)](https://travis-ci.org/domaframework/doma) [![Join the chat at https://gitter.im/domaframework/doma](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/domaframework/doma?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
1+
Doma [![Build Status](https://github.com/domaframework/doma/workflows/Java%20CI%20with%20Gradle/badge.svg)](https://github.com/domaframework/doma/actions?query=workflow%3A%22Java+CI+with+Gradle%22) [![Join the chat at https://gitter.im/domaframework/doma](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/domaframework/doma?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
22
========================================
33

44
Doma is a database access framework for Java.
@@ -55,8 +55,8 @@ Build with Gradle
5555

5656
```groovy
5757
dependencies {
58-
implementation "org.seasar.doma:doma-core:2.38.0"
59-
annotationProcessor "org.seasar.doma:doma-processor:2.38.0"
58+
implementation "org.seasar.doma:doma-core:2.39.0"
59+
annotationProcessor "org.seasar.doma:doma-processor:2.39.0"
6060
}
6161
```
6262

‎build.gradle.kts‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
kotlin("jvm") version "1.3.72" apply false
44
kotlin("kapt") version "1.3.72" apply false
55
id("com.diffplug.eclipse.apt") version "3.22.0" apply false
6-
id("com.diffplug.gradle.spotless") version "3.27.2"
6+
id("com.diffplug.spotless") version "5.1.0"
77
id("de.marcphilipp.nexus-publish") version "0.4.0" apply false
88
id("net.researchgate.release") version "2.8.1"
99
}
@@ -12,11 +12,6 @@ val encoding: String by project
1212
val isSnapshot = version.toString().endsWith("SNAPSHOT")
1313
val releaseVersion = properties["release.releaseVersion"].toString()
1414
val newVersion = properties["release.newVersion"].toString()
15-
val secretKeyRingFile: String? =
16-
findProperty("signing.secretKeyRingFile")?.toString()?.let {
17-
if (it.isEmpty()) null
18-
else file(it).absolutePath
19-
}
2015

2116
fun replaceVersionInArtifact(ver: String) {
2217
ant.withGroovyBuilder {
@@ -42,11 +37,9 @@ subprojects {
4237
apply(plugin = "maven-publish")
4338
apply(plugin = "signing")
4439
apply(plugin = "com.diffplug.eclipse.apt")
45-
apply(plugin = "com.diffplug.gradle.spotless")
40+
apply(plugin = "com.diffplug.spotless")
4641
apply(plugin = "de.marcphilipp.nexus-publish")
4742

48-
extra["signing.secretKeyRingFile"] = secretKeyRingFile
49-
5043
val replaceVersionInJava by tasks.registering {
5144
doLast {
5245
replaceVersionInArtifact(version.toString())
@@ -181,6 +174,9 @@ configure(subprojects.filter { it.name in listOf("doma-core", "doma-processor")
181174
}
182175

183176
configure<SigningExtension> {
177+
val signingKey: String? by project
178+
val signingPassword: String? by project
179+
useInMemoryPgpKeys(signingKey, signingPassword)
184180
val publishing = convention.findByType(PublishingExtension::class)!!
185181
sign(publishing.publications)
186182
isRequired = !isSnapshot
@@ -213,7 +209,7 @@ rootProject.apply {
213209

214210
val beforeReleaseBuild by tasks.existing {
215211
dependsOn(replaceVersion)
216-
}
212+
}
217213

218214
val updateVersion by tasks.existing {
219215
doLast {

‎docs/build.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ Write your build.gradle as follows:
3535
.. code-block:: groovy
3636
3737
dependencies {
38-
implementation "org.seasar.doma:doma-core:2.38.0"
39-
annotationProcessor "org.seasar.doma:doma-processor:2.38.0"
38+
implementation "org.seasar.doma:doma-core:2.39.0"
39+
annotationProcessor "org.seasar.doma:doma-processor:2.39.0"
4040
}
4141
4242
To simplify your build.script, we recommend that you use the `Doma Compile Plugin`_.

‎docs/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ About Doma
7676
.. toctree::
7777
:maxdepth: 1
7878

79-
release-notes
8079
faq
8180

8281
Links
8382
=====
8483

8584
* `News and announcements <https://twitter.com/domaframework>`_
8685
* `GitHub repository <https://github.com/domaframework/doma>`_
86+
* `Release Notes <https://github.com/domaframework/doma/releases>`_
8787
* `JavaDoc <https://www.javadoc.io/doc/org.seasar.doma/doma-core/latest/index.html>`_
8888
* `Boilerplate <https://github.com/domaframework/simple-boilerplate>`_
8989
* `Examples <https://github.com/domaframework/simple-examples>`_

0 commit comments

Comments
 (0)