Skip to content

Commit 93dcd67

Browse files
committed
Finish v0.6.3
2 parents 5ac3df2 + f10cc62 commit 93dcd67

9 files changed

Lines changed: 117 additions & 97 deletions

File tree

.github/workflows/check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ 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
1515
- name: Set up JDK ${{ matrix.java_version }}
16-
uses: actions/setup-java@v4
16+
uses: actions/setup-java@v5
1717
with:
1818
java-version: ${{ matrix.java_version }}
1919
distribution: 'adopt'
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
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+
- name: Set up JDK
17+
uses: actions/setup-java@v5
18+
with:
19+
java-version: 17
20+
distribution: 'temurin'
21+
cache: gradle
22+
- name: Deploy to Central Portal
23+
run: |
24+
./gradlew publishMavenPublicationToStagingRepository
25+
./gradlew jreleaserDeploy
26+
env:
27+
JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
28+
JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
29+
JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
30+
JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_SIGNING_PUBLIC_KEY }}
31+
JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SIGNING_KEY }}
32+
JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_SIGNING_PASSWORD }}

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

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

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle.kts

Lines changed: 48 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import me.qoomon.gitversioning.commons.GitRefType
22
import java.util.Calendar
3+
import org.jreleaser.model.Active.*
34

45
plugins {
56
`java-library`
67
`maven-publish`
78
jacoco
8-
signing
99
id("org.cadixdev.licenser") version "0.6.1"
1010
id("me.qoomon.git-versioning") version "6.4.4"
11-
id("com.gorylenko.gradle-git-properties") version "2.4.2"
12-
id("io.freefair.lombok") version "8.11"
13-
id("io.freefair.javadoc-links") version "8.11"
14-
id("io.freefair.javadoc-utf-8") version "8.11"
15-
id("io.freefair.maven-central.validate-poms") version "8.11"
16-
id("com.github.ben-manes.versions") version "0.51.0"
11+
id("com.gorylenko.gradle-git-properties") version "2.5.2"
12+
id("io.freefair.lombok") version "8.14.2"
13+
id("io.freefair.javadoc-links") version "8.14.2"
14+
id("io.freefair.javadoc-utf-8") version "8.14.2"
15+
id("io.freefair.maven-central.validate-poms") version "8.14.2"
16+
id("com.github.ben-manes.versions") version "0.52.0"
1717
id("ru.vyarus.pom") version "3.0.0"
18-
id("io.codearte.nexus-staging") version "0.30.0"
18+
id("org.jreleaser") version "1.19.0"
1919
}
2020

2121
group = "io.github.1c-syntax"
@@ -108,31 +108,11 @@ artifacts {
108108
archives(tasks["javadocJar"])
109109
}
110110

111-
signing {
112-
val signingInMemoryKey: String? by project // env.ORG_GRADLE_PROJECT_signingInMemoryKey
113-
val signingInMemoryPassword: String? by project // env.ORG_GRADLE_PROJECT_signingInMemoryPassword
114-
if (signingInMemoryKey != null) {
115-
useInMemoryPgpKeys(signingInMemoryKey, signingInMemoryPassword)
116-
sign(publishing.publications)
117-
}
118-
}
119-
120111
publishing {
121112
repositories {
122113
maven {
123-
name = "sonatype"
124-
url = if (isSnapshot)
125-
uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
126-
else
127-
uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
128-
129-
val sonatypeUsername: String? by project
130-
val sonatypePassword: String? by project
131-
132-
credentials {
133-
username = sonatypeUsername // ORG_GRADLE_PROJECT_sonatypeUsername
134-
password = sonatypePassword // ORG_GRADLE_PROJECT_sonatypePassword
135-
}
114+
name = "staging"
115+
url = layout.buildDirectory.dir("staging-deploy").get().asFile.toURI()
136116
}
137117
}
138118
publications {
@@ -184,12 +164,47 @@ publishing {
184164
developerConnection.set("scm:git:git@github.com:1c-syntax/utils.git")
185165
url.set("https://github.com/1c-syntax/utils")
186166
}
167+
// Добавлено для Maven Central validation
168+
issueManagement {
169+
system.set("GitHub Issues")
170+
url.set("https://github.com/1c-syntax/utils/issues")
171+
}
172+
// Добавлено для Maven Central validation
173+
ciManagement {
174+
system.set("GitHub Actions")
175+
url.set("https://github.com/1c-syntax/utils/actions")
176+
}
187177
}
188178
}
189179
}
190180
}
191181

192-
nexusStaging {
193-
serverUrl = "https://s01.oss.sonatype.org/service/local/"
194-
stagingProfileId = "15bd88b4d17915" // ./gradlew getStagingProfile
182+
jreleaser {
183+
signing {
184+
active = ALWAYS
185+
armored = true
186+
}
187+
deploy {
188+
maven {
189+
mavenCentral {
190+
create("release-deploy") {
191+
active = RELEASE
192+
url = "https://central.sonatype.com/api/v1/publisher"
193+
stagingRepository("build/staging-deploy")
194+
}
195+
}
196+
nexus2 {
197+
create("snapshot-deploy") {
198+
active = SNAPSHOT
199+
snapshotUrl = "https://central.sonatype.com/repository/maven-snapshots/"
200+
applyMavenCentralRules = true
201+
snapshotSupported = true
202+
closeRepository = true
203+
releaseRepository = true
204+
stagingRepository("build/staging-deploy")
205+
}
206+
}
207+
}
208+
}
195209
}
210+

gradle/wrapper/gradle-wrapper.jar

-17.6 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 20 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 12 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)