Skip to content

Commit 6c2bf7c

Browse files
vincentlauvlwjvincentlauvlwj
authored
Merge pull request #393 from kotlin-orm/v3.5.x
Release v3.5.0
2 parents 3dec339 + 5398067 commit 6c2bf7c

File tree

164 files changed

+4639
-2510
lines changed

Some content is hidden

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

164 files changed

+4639
-2510
lines changed

‎.github/workflows/build.yml

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: build
2+
3+
on:
4+
push:
5+
pull_request:
6+
types: [opened, synchronize, reopened]
7+
release:
8+
types: [published]
9+
10+
jobs:
11+
build:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout Code
15+
uses: actions/checkout@v2
16+
17+
- name: Setup Java
18+
uses: actions/setup-java@v2
19+
with:
20+
distribution: temurin
21+
java-version: 8
22+
23+
- name: Setup Gradle
24+
uses: gradle/gradle-build-action@v2
25+
26+
- name: Assemble the Project
27+
run: ./gradlew assemble
28+
29+
- name: Run Tests
30+
run: ./gradlew check
31+
32+
- name: Publish Artifacts
33+
run: |
34+
if [[ $(cat "ktorm.version") =~ "SNAPSHOT" ]] ; then
35+
./gradlew publishDistPublicationToSnapshotRepository
36+
else
37+
if [[ $GITHUB_EVENT_NAME == "release" ]] ; then
38+
./gradlew publishDistPublicationToCentralRepository
39+
else
40+
echo "Skip release publication because this is not a release event"
41+
fi
42+
fi
43+
env:
44+
OSSRH_USER: ${{secrets.OSSRH_USER}}
45+
OSSRH_PASSWORD: ${{secrets.OSSRH_PASSWORD}}
46+
GPG_KEY_ID: ${{secrets.GPG_KEY_ID}}
47+
GPG_PASSWORD: ${{secrets.GPG_PASSWORD}}
48+
GPG_SECRET_KEY: ${{secrets.GPG_SECRET_KEY}}

‎.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ logs/
2121

2222
### NetBeans ###
2323
nbproject/private/
24-
build/
2524
nbbuild/
2625
dist/
2726
nbdist/
2827
.nb-gradle/
29-

‎.travis.yml

-33
This file was deleted.

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ Pull requests are always welcome and can be a quick way to get your fix or impro
99
- By contributing to Ktorm, you agree that your contributions will be licensed under [Apache License 2.0](LICENSE).
1010
- Coding Conventions are very important. Refer to the [Kotlin Style Guide](https://kotlinlang.org/docs/reference/coding-conventions.html) for the recommended coding standards of Ktorm.
1111
- If you've added code that should be tested, add tests and ensure they all pass. If you've changed APIs, update the documentation.
12-
- If it's your first time contributing to Ktorm, please also update the `build.gradle` file, add your GitHub ID to the developers info, which will let more people know your contributions.
12+
- If it's your first time contributing to Ktorm, please also update [this file](buildSrc/src/main/kotlin/ktorm.maven-publish.gradle.kts), add your GitHub ID to the developer's info, which will let more people know your contributions.

‎README.md

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@
22
<img src="https://raw.githubusercontent.com/kotlin-orm/ktorm-docs/master/source/images/logo-full.png" alt="Ktorm" width="300" />
33
</p>
44
<p align="center">
5-
<a href="https://www.travis-ci.org/kotlin-orm/ktorm">
6-
<img src="https://www.travis-ci.org/kotlin-orm/ktorm.svg?branch=master" alt="Build Status" />
5+
<a href="https://github.com/kotlin-orm/ktorm/actions/workflows/build.yml">
6+
<img src="https://github.com/kotlin-orm/ktorm/actions/workflows/build.yml/badge.svg" alt="Build Status" />
77
</a>
88
<a href="https://search.maven.org/search?q=g:%22org.ktorm%22">
99
<img src="https://img.shields.io/maven-central/v/org.ktorm/ktorm-core.svg?label=Maven%20Central" alt="Maven Central" />
1010
</a>
1111
<a href="LICENSE">
1212
<img src="https://img.shields.io/badge/license-Apache%202-blue.svg?maxAge=2592000" alt="Apache License 2" />
1313
</a>
14-
<a href="https://app.codacy.com/gh/kotlin-orm/ktorm?utm_source=github.com&utm_medium=referral&utm_content=kotlin-orm/ktorm&utm_campaign=Badge_Grade_Dashboard">
15-
<img src="https://api.codacy.com/project/badge/Grade/72c1185f408b4cc0974c735fa5c419bc" alt="Codacy Badge" />
16-
</a>
1714
<a href="https://github.com/KotlinBy/awesome-kotlin">
1815
<img src="https://kotlin.link/awesome-kotlin.svg" alt="Awesome Kotlin Badge" />
1916
</a>

‎README_cn.md

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@
22
<img src="https://raw.githubusercontent.com/kotlin-orm/ktorm-docs/master/source/images/logo-full.png" alt="Ktorm" width="300" />
33
</p>
44
<p align="center">
5-
<a href="https://www.travis-ci.org/kotlin-orm/ktorm">
6-
<img src="https://www.travis-ci.org/kotlin-orm/ktorm.svg?branch=master" alt="Build Status" />
5+
<a href="https://github.com/kotlin-orm/ktorm/actions/workflows/build.yml">
6+
<img src="https://github.com/kotlin-orm/ktorm/actions/workflows/build.yml/badge.svg" alt="Build Status" />
77
</a>
88
<a href="https://search.maven.org/search?q=g:%22org.ktorm%22">
99
<img src="https://img.shields.io/maven-central/v/org.ktorm/ktorm-core.svg?label=Maven%20Central" alt="Maven Central" />
1010
</a>
1111
<a href="LICENSE">
1212
<img src="https://img.shields.io/badge/license-Apache%202-blue.svg?maxAge=2592000" alt="Apache License 2" />
1313
</a>
14-
<a href="https://app.codacy.com/gh/kotlin-orm/ktorm?utm_source=github.com&utm_medium=referral&utm_content=kotlin-orm/ktorm&utm_campaign=Badge_Grade_Dashboard">
15-
<img src="https://api.codacy.com/project/badge/Grade/72c1185f408b4cc0974c735fa5c419bc" alt="Codacy Badge" />
16-
</a>
1714
<a href="https://github.com/KotlinBy/awesome-kotlin">
1815
<img src="https://kotlin.link/awesome-kotlin.svg" alt="Awesome Kotlin Badge" />
1916
</a>

‎README_jp.md

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@
22
<img src="https://raw.githubusercontent.com/kotlin-orm/ktorm-docs/master/source/images/logo-full.png" alt="Ktorm" width="300" />
33
</p>
44
<p align="center">
5-
<a href="https://www.travis-ci.org/kotlin-orm/ktorm">
6-
<img src="https://www.travis-ci.org/kotlin-orm/ktorm.svg?branch=master" alt="Build Status" />
5+
<a href="https://github.com/kotlin-orm/ktorm/actions/workflows/build.yml">
6+
<img src="https://github.com/kotlin-orm/ktorm/actions/workflows/build.yml/badge.svg" alt="Build Status" />
77
</a>
88
<a href="https://search.maven.org/search?q=g:%22org.ktorm%22">
99
<img src="https://img.shields.io/maven-central/v/org.ktorm/ktorm-core.svg?label=Maven%20Central" alt="Maven Central" />
1010
</a>
1111
<a href="LICENSE">
1212
<img src="https://img.shields.io/badge/license-Apache%202-blue.svg?maxAge=2592000" alt="Apache License 2" />
1313
</a>
14-
<a href="https://app.codacy.com/gh/kotlin-orm/ktorm?utm_source=github.com&utm_medium=referral&utm_content=kotlin-orm/ktorm&utm_campaign=Badge_Grade_Dashboard">
15-
<img src="https://api.codacy.com/project/badge/Grade/72c1185f408b4cc0974c735fa5c419bc" alt="Codacy Badge" />
16-
</a>
1714
<a href="https://github.com/KotlinBy/awesome-kotlin">
1815
<img src="https://kotlin.link/awesome-kotlin.svg" alt="Awesome Kotlin Badge" />
1916
</a>

‎build.gradle

-220
This file was deleted.

0 commit comments

Comments
 (0)