Skip to content

Commit 1694979

Browse files
theshadowcotheshadowco
committed
Finish v0.26.1
2 parents 4fc853d + 178f915 commit 1694979

File tree

13 files changed

+122
-100
lines changed

13 files changed

+122
-100
lines changed

‎.github/workflows/check.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ jobs:
1111
java_version: ['17', '21']
1212
os: [ubuntu-latest, windows-latest, macOS-latest]
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
15+
with:
16+
fetch-depth: 0
1517
- name: Set up JDK ${{ matrix.java_version }}
16-
uses: actions/setup-java@v4
18+
uses: actions/setup-java@v5
1719
with:
1820
java-version: ${{ matrix.java_version }}
1921
distribution: 'adopt'

‎.github/workflows/gh-pages.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ jobs:
1717
build-deploy:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v4
20+
- uses: actions/checkout@v5
21+
with:
22+
fetch-depth: 0
2123

2224
- name: Setup JDK
23-
uses: actions/setup-java@v4
25+
uses: actions/setup-java@v5
2426
with:
2527
java-version: 17
2628
distribution: 'adopt'

‎.github/workflows/javadoc.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ jobs:
66
build:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v4
9+
- uses: actions/checkout@v5
10+
with:
11+
fetch-depth: 0
1012
- name: Set up JDK
11-
uses: actions/setup-java@v4
13+
uses: actions/setup-java@v5
1214
with:
1315
java-version: 17
1416
distribution: 'adopt'

‎.github/workflows/publish-to-maven-central.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Publish to maven central
2+
3+
on:
4+
release:
5+
types: [published]
6+
push:
7+
branches:
8+
- develop
9+
workflow_dispatch:
10+
11+
jobs:
12+
publish:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v5
16+
with:
17+
fetch-depth: 0
18+
- name: Set up JDK
19+
uses: actions/setup-java@v5
20+
with:
21+
java-version: 17
22+
distribution: 'temurin'
23+
cache: gradle
24+
- name: Deploy to Central Portal
25+
run: |
26+
./gradlew publishMavenPublicationToStagingRepository
27+
./gradlew jreleaserDeploy
28+
env:
29+
JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30+
JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
31+
JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
32+
JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_SIGNING_PUBLIC_KEY }}
33+
JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SIGNING_KEY }}
34+
JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_SIGNING_PASSWORD }}
35+
JRELEASER_DEPLOY_MAVEN_NEXUS2_SNAPSHOT_DEPLOY_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
36+
JRELEASER_DEPLOY_MAVEN_NEXUS2_SNAPSHOT_DEPLOY_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}

‎.github/workflows/publish-to-sonatype.yml‎

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

‎.github/workflows/qa.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
runs-on: ubuntu-latest
1313
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.event.repository.full_name
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v5
1616
with:
1717
fetch-depth: ''
1818
- run: |
1919
git fetch --prune --unshallow
2020
- name: Set up JDK 17
21-
uses: actions/setup-java@v4
21+
uses: actions/setup-java@v5
2222
with:
2323
java-version: 17
2424
distribution: 'adopt'

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ jobs:
1212
matrix:
1313
os: [ ubuntu-latest, windows-latest, macOS-latest ]
1414
steps:
15-
- uses: actions/checkout@v4
16-
- uses: actions/setup-java@v4
15+
- uses: actions/checkout@v5
16+
with:
17+
fetch-depth: 0
18+
- uses: actions/setup-java@v5
1719
with:
1820
java-version: 17
1921
distribution: 'adopt'

‎.github/workflows/update-gradle.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
14+
with:
15+
fetch-depth: 0
1416

1517
- name: Set up JDK 17
16-
uses: actions/setup-java@v4
18+
uses: actions/setup-java@v5
1719
with:
1820
java-version: 17
1921
distribution: 'temurin'

‎build.gradle.kts‎

Lines changed: 58 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,43 @@
1-
import me.qoomon.gitversioning.commons.GitRefType
2-
import java.util.*
1+
import java.util.Calendar
2+
import org.jreleaser.model.Active.*
33

44
plugins {
5+
`java-library`
56
`maven-publish`
6-
idea
77
jacoco
8-
`java-library`
8+
idea
99
antlr
10-
signing
11-
id("org.sonarqube") version "6.0.1.5171"
1210
id("org.cadixdev.licenser") version "0.6.1"
1311
id("me.qoomon.git-versioning") version "6.4.4"
14-
id("io.freefair.javadoc-links") version "8.12.1"
15-
id("io.freefair.javadoc-utf-8") version "8.12.1"
12+
id("io.freefair.javadoc-links") version "8.14.2"
13+
id("io.freefair.javadoc-utf-8") version "8.14.2"
14+
id("io.freefair.maven-central.validate-poms") version "8.14.2"
1615
id("com.github.ben-manes.versions") version "0.52.0"
17-
id("me.champeau.gradle.jmh") version "0.5.3"
18-
id("io.freefair.maven-central.validate-poms") version "8.12.1"
1916
id("ru.vyarus.pom") version "3.0.0"
20-
id("io.codearte.nexus-staging") version "0.30.0"
17+
id("org.jreleaser") version "1.19.0"
18+
id("org.sonarqube") version "6.2.0.5505"
19+
id("me.champeau.gradle.jmh") version "0.5.3"
2120
}
2221

2322
repositories {
2423
mavenLocal()
2524
mavenCentral()
26-
maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots")
2725
}
2826

2927
group = "io.github.1c-syntax"
3028
gitVersioning.apply {
3129
refs {
32-
considerTagsOnBranches = true
30+
describeTagFirstParent = false
3331
tag("v(?<tagVersion>[0-9].*)") {
3432
version = "\${ref.tagVersion}\${dirty}"
3533
}
34+
35+
branch("develop") {
36+
version = "\${describe.tag.version.major}." +
37+
"\${describe.tag.version.minor.next}.0." +
38+
"\${describe.distance}-SNAPSHOT\${dirty}"
39+
}
40+
3641
branch(".+") {
3742
version = "\${ref}-\${commit.short}\${dirty}"
3843
}
@@ -42,18 +47,17 @@ gitVersioning.apply {
4247
version = "\${commit.short}\${dirty}"
4348
}
4449
}
45-
val isSnapshot = gitVersioning.gitVersionDetails.refType != GitRefType.TAG
4650

4751
dependencies {
48-
antlr("io.github.1c-syntax", "antlr4", "0.1.1")
52+
antlr("io.github.1c-syntax", "antlr4", "0.1.2")
4953

50-
implementation("io.github.1c-syntax", "bsl-parser-core", "0.3.0")
54+
implementation("io.github.1c-syntax", "bsl-parser-core", "0.3.1")
5155

5256
// stat analysis
5357
compileOnly("com.github.spotbugs", "spotbugs-annotations", "4.8.6")
5458

5559
// testing
56-
testImplementation("io.github.1c-syntax", "bsl-parser-testing", "0.3.0")
60+
testImplementation("io.github.1c-syntax", "bsl-parser-testing", "0.3.1")
5761
testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.4")
5862
testImplementation("org.junit.jupiter", "junit-jupiter-engine", "5.11.4")
5963
testImplementation("org.junit.jupiter", "junit-jupiter-params", "5.11.4")
@@ -199,39 +203,16 @@ artifacts {
199203
archives(tasks["javadocJar"])
200204
}
201205

202-
signing {
203-
val signingInMemoryKey: String? by project // env.ORG_GRADLE_PROJECT_signingInMemoryKey
204-
val signingInMemoryPassword: String? by project // env.ORG_GRADLE_PROJECT_signingInMemoryPassword
205-
if (signingInMemoryKey != null) {
206-
useInMemoryPgpKeys(signingInMemoryKey, signingInMemoryPassword)
207-
sign(publishing.publications)
208-
}
209-
}
210-
211206
publishing {
212207
repositories {
213208
maven {
214-
name = "sonatype"
215-
url = if (isSnapshot)
216-
uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
217-
else
218-
uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
219-
220-
val sonatypeUsername: String? by project
221-
val sonatypePassword: String? by project
222-
223-
credentials {
224-
username = sonatypeUsername // ORG_GRADLE_PROJECT_sonatypeUsername
225-
password = sonatypePassword // ORG_GRADLE_PROJECT_sonatypePassword
226-
}
209+
name = "staging"
210+
url = layout.buildDirectory.dir("staging-deploy").get().asFile.toURI()
227211
}
228212
}
229213
publications {
230214
create<MavenPublication>("maven") {
231215
from(components["java"])
232-
if (isSnapshot && project.hasProperty("simplifyVersion")) {
233-
version = findProperty("git.ref.slug") as String + "-SNAPSHOT"
234-
}
235216

236217
pom {
237218
description.set("Collection of parsers for Language 1C (BSL) in ANTLR4 format.")
@@ -282,12 +263,44 @@ publishing {
282263
developerConnection.set("scm:git:[email protected]:1c-syntax/bsl-parser.git")
283264
url.set("https://github.com/1c-syntax/bsl-parser")
284265
}
266+
issueManagement {
267+
system.set("GitHub Issues")
268+
url.set("https://github.com/1c-syntax/bsl-parser/issues")
269+
}
270+
ciManagement {
271+
system.set("GitHub Actions")
272+
url.set("https://github.com/1c-syntax/bsl-parser/actions")
273+
}
285274
}
286275
}
287276
}
288277
}
289278

290-
nexusStaging {
291-
serverUrl = "https://s01.oss.sonatype.org/service/local/"
292-
stagingProfileId = "15bd88b4d17915" // ./gradlew getStagingProfile
279+
jreleaser {
280+
signing {
281+
active = ALWAYS
282+
armored = true
283+
}
284+
deploy {
285+
maven {
286+
mavenCentral {
287+
create("release-deploy") {
288+
active = RELEASE
289+
url = "https://central.sonatype.com/api/v1/publisher"
290+
stagingRepository("build/staging-deploy")
291+
}
292+
}
293+
nexus2 {
294+
create("snapshot-deploy") {
295+
active = SNAPSHOT
296+
snapshotUrl = "https://central.sonatype.com/repository/maven-snapshots/"
297+
applyMavenCentralRules = true
298+
snapshotSupported = true
299+
closeRepository = true
300+
releaseRepository = true
301+
stagingRepository("build/staging-deploy")
302+
}
303+
}
304+
}
305+
}
293306
}

‎gradle/wrapper/gradle-wrapper.jar‎

181 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)