Skip to content

Commit e10333a

Browse files
committed
Finish v0.6.4
2 parents 93dcd67 + 8e20f0d commit e10333a

File tree

3 files changed

+20
-16
lines changed

3 files changed

+20
-16
lines changed

.github/workflows/check.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ jobs:
1212
os: [ubuntu-latest, windows-latest, macOS-latest]
1313
steps:
1414
- uses: actions/checkout@v5
15+
with:
16+
fetch-depth: 0
1517
- name: Set up JDK ${{ matrix.java_version }}
1618
uses: actions/setup-java@v5
1719
with:

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v5
16+
with:
17+
fetch-depth: 0
1618
- name: Set up JDK
1719
uses: actions/setup-java@v5
1820
with:
@@ -30,3 +32,5 @@ jobs:
3032
JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_SIGNING_PUBLIC_KEY }}
3133
JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SIGNING_KEY }}
3234
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 }}

build.gradle.kts

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import me.qoomon.gitversioning.commons.GitRefType
21
import java.util.Calendar
32
import org.jreleaser.model.Active.*
43

@@ -8,23 +7,29 @@ plugins {
87
jacoco
98
id("org.cadixdev.licenser") version "0.6.1"
109
id("me.qoomon.git-versioning") version "6.4.4"
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"
10+
id("io.freefair.lombok") version "9.0.0"
11+
id("io.freefair.javadoc-links") version "9.0.0"
12+
id("io.freefair.javadoc-utf-8") version "9.0.0"
13+
id("io.freefair.maven-central.validate-poms") version "9.0.0"
14+
id("com.github.ben-manes.versions") version "0.53.0"
1715
id("ru.vyarus.pom") version "3.0.0"
18-
id("org.jreleaser") version "1.19.0"
16+
id("org.jreleaser") version "1.20.0"
1917
}
2018

2119
group = "io.github.1c-syntax"
2220
gitVersioning.apply {
2321
refs {
24-
considerTagsOnBranches = true
22+
describeTagFirstParent = false
2523
tag("v(?<tagVersion>[0-9].*)") {
2624
version = "\${ref.tagVersion}\${dirty}"
2725
}
26+
27+
branch("develop") {
28+
version = "\${describe.tag.version.major}." +
29+
"\${describe.tag.version.minor.next}.0." +
30+
"\${describe.distance}-SNAPSHOT\${dirty}"
31+
}
32+
2833
branch(".+") {
2934
version = "\${ref}-\${commit.short}\${dirty}"
3035
}
@@ -34,7 +39,6 @@ gitVersioning.apply {
3439
version = "\${commit.short}\${dirty}"
3540
}
3641
}
37-
val isSnapshot = gitVersioning.gitVersionDetails.refType != GitRefType.TAG
3842

3943
repositories {
4044
mavenCentral()
@@ -118,11 +122,6 @@ publishing {
118122
publications {
119123
create<MavenPublication>("maven") {
120124
from(components["java"])
121-
122-
if (isSnapshot && project.hasProperty("simplifyVersion")) {
123-
version = findProperty("git.ref.slug") as String + "-SNAPSHOT"
124-
}
125-
126125
pom {
127126
description.set("Common utils for 1c-syntax team java projects")
128127
url.set("https://github.com/1c-syntax/utils")
@@ -207,4 +206,3 @@ jreleaser {
207206
}
208207
}
209208
}
210-

0 commit comments

Comments
 (0)