Skip to content

Commit 4138260

Browse files
theshadowcotheshadowco
committed
Finish v0.3.1
2 parents 2f93052 + 060c129 commit 4138260

File tree

12 files changed

+115
-96
lines changed

12 files changed

+115
-96
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/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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414

1515
- name: Set up JDK 17
16-
uses: actions/setup-java@v4
16+
uses: actions/setup-java@v5
1717
with:
1818
java-version: 17
1919
distribution: 'temurin'

‎build.gradle.kts‎

Lines changed: 57 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,42 @@
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`
9-
signing
10-
id("org.sonarqube") version "6.0.1.5171"
8+
idea
119
id("org.cadixdev.licenser") version "0.6.1"
1210
id("me.qoomon.git-versioning") version "6.4.4"
13-
id("io.freefair.javadoc-links") version "8.12.1"
14-
id("io.freefair.javadoc-utf-8") version "8.12.1"
11+
id("io.freefair.lombok") version "8.14.2"
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"
1515
id("com.github.ben-manes.versions") version "0.52.0"
16-
id("io.freefair.maven-central.validate-poms") version "8.12.1"
1716
id("ru.vyarus.pom") version "3.0.0"
18-
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"
1919
}
2020

2121
repositories {
2222
mavenLocal()
2323
mavenCentral()
24-
maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots")
2524
}
2625

2726
group = "io.github.1c-syntax"
2827
gitVersioning.apply {
2928
refs {
30-
considerTagsOnBranches = true
29+
describeTagFirstParent = false
3130
tag("v(?<tagVersion>[0-9].*)") {
3231
version = "\${ref.tagVersion}\${dirty}"
3332
}
33+
34+
branch("develop") {
35+
version = "\${describe.tag.version.major}." +
36+
"\${describe.tag.version.minor.next}.0." +
37+
"\${describe.distance}-SNAPSHOT\${dirty}"
38+
}
39+
3440
branch(".+") {
3541
version = "\${ref}-\${commit.short}\${dirty}"
3642
}
@@ -40,11 +46,10 @@ gitVersioning.apply {
4046
version = "\${commit.short}\${dirty}"
4147
}
4248
}
43-
val isSnapshot = gitVersioning.gitVersionDetails.refType != GitRefType.TAG
4449

4550
dependencies {
46-
implementation("io.github.1c-syntax", "antlr4", "0.1.1")
47-
implementation("io.github.1c-syntax", "utils", "0.6.2")
51+
implementation("io.github.1c-syntax", "antlr4", "0.1.2")
52+
implementation("io.github.1c-syntax", "utils", "0.6.3")
4853
implementation("commons-io", "commons-io", "2.15.1")
4954
}
5055

@@ -118,39 +123,16 @@ artifacts {
118123
archives(tasks["javadocJar"])
119124
}
120125

121-
signing {
122-
val signingInMemoryKey: String? by project // env.ORG_GRADLE_PROJECT_signingInMemoryKey
123-
val signingInMemoryPassword: String? by project // env.ORG_GRADLE_PROJECT_signingInMemoryPassword
124-
if (signingInMemoryKey != null) {
125-
useInMemoryPgpKeys(signingInMemoryKey, signingInMemoryPassword)
126-
sign(publishing.publications)
127-
}
128-
}
129-
130126
publishing {
131127
repositories {
132128
maven {
133-
name = "sonatype"
134-
url = if (isSnapshot)
135-
uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
136-
else
137-
uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
138-
139-
val sonatypeUsername: String? by project
140-
val sonatypePassword: String? by project
141-
142-
credentials {
143-
username = sonatypeUsername // ORG_GRADLE_PROJECT_sonatypeUsername
144-
password = sonatypePassword // ORG_GRADLE_PROJECT_sonatypePassword
145-
}
129+
name = "staging"
130+
url = layout.buildDirectory.dir("staging-deploy").get().asFile.toURI()
146131
}
147132
}
148133
publications {
149134
create<MavenPublication>("maven") {
150135
from(components["java"])
151-
if (isSnapshot && project.hasProperty("simplifyVersion")) {
152-
version = findProperty("git.ref.slug") as String + "-SNAPSHOT"
153-
}
154136

155137
pom {
156138
description.set("Core library for Collection of parsers for Language 1C (BSL) in ANTLR4 format.")
@@ -193,12 +175,44 @@ publishing {
193175
developerConnection.set("scm:git:[email protected]:1c-syntax/bsl-parser-core.git")
194176
url.set("https://github.com/1c-syntax/bsl-parser-core")
195177
}
178+
issueManagement {
179+
system.set("GitHub Issues")
180+
url.set("https://github.com/1c-syntax/bsl-parser-core/issues")
181+
}
182+
ciManagement {
183+
system.set("GitHub Actions")
184+
url.set("https://github.com/1c-syntax/bsl-parser-core/actions")
185+
}
196186
}
197187
}
198188
}
199189
}
200190

201-
nexusStaging {
202-
serverUrl = "https://s01.oss.sonatype.org/service/local/"
203-
stagingProfileId = "15bd88b4d17915" // ./gradlew getStagingProfile
191+
jreleaser {
192+
signing {
193+
active = ALWAYS
194+
armored = true
195+
}
196+
deploy {
197+
maven {
198+
mavenCentral {
199+
create("release-deploy") {
200+
active = RELEASE
201+
url = "https://central.sonatype.com/api/v1/publisher"
202+
stagingRepository("build/staging-deploy")
203+
}
204+
}
205+
nexus2 {
206+
create("snapshot-deploy") {
207+
active = SNAPSHOT
208+
snapshotUrl = "https://central.sonatype.com/repository/maven-snapshots/"
209+
applyMavenCentralRules = true
210+
snapshotSupported = true
211+
closeRepository = true
212+
releaseRepository = true
213+
stagingRepository("build/staging-deploy")
214+
}
215+
}
216+
}
217+
}
204218
}

‎gradle/wrapper/gradle-wrapper.jar‎

181 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)