Skip to content

Commit c10cb7f

Browse files
committed
Fix release plugin?
1 parent 81e26f4 commit c10cb7f

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

build.gradle

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import com.bmuschko.gradle.docker.tasks.container.*
33
import com.bmuschko.gradle.docker.tasks.image.*
44

55
plugins {
6+
id 'pl.allegro.tech.build.axion-release' version '1.9.0'
67
id "java"
78
id "groovy"
89
id "jacoco"
910
id "osgi"
1011
id "maven-publish"
1112
id "com.bmuschko.docker-remote-api" version "3.2.1"
12-
id 'pl.allegro.tech.build.axion-release' version '1.8.1'
1313
id "com.github.hierynomus.license" version "0.12.1"
1414
id "com.jfrog.bintray" version "1.7"
1515
id 'ru.vyarus.java-lib' version '1.0.5'
@@ -20,6 +20,19 @@ plugins {
2020

2121
group = "com.hierynomus"
2222

23+
scmVersion {
24+
tag {
25+
prefix = 'v'
26+
versionSeparator = ''
27+
}
28+
hooks {
29+
pre 'fileUpdate', [file: 'README.adoc', pattern: { v, c -> /:sshj_version: .*/}, replacement: { v, c -> ":sshj_version: $v" }]
30+
pre 'commit'
31+
}
32+
}
33+
34+
project.version = scmVersion.version
35+
2336
defaultTasks "build"
2437

2538
repositories {
@@ -65,19 +78,6 @@ license {
6578
excludes(['**/djb/Curve25519.java', '**/sshj/common/Base64.java'])
6679
}
6780

68-
scmVersion {
69-
tag {
70-
prefix = 'v'
71-
versionSeparator = ''
72-
}
73-
hooks {
74-
pre 'fileUpdate', [file: 'README.adoc', pattern: { v, c -> /:sshj_version: .*/}, replacement: { v, c -> ":sshj_version: $v" }]
75-
pre 'commit'
76-
}
77-
}
78-
79-
project.version = scmVersion.version
80-
8181
// This disables the pedantic doclint feature of JDK8
8282
if (JavaVersion.current().isJava8Compatible()) {
8383
tasks.withType(Javadoc) {
@@ -229,8 +229,8 @@ if (project.hasProperty("bintrayUsername") && project.hasProperty("bintrayApiKey
229229
labels = ["ssh", "sftp", "secure-shell", "network", "file-transfer"]
230230
githubRepo = "hierynomus/sshj"
231231
version {
232-
name = project.version.toString()
233-
vcsTag = "v${project.version}"
232+
name = "${->project.version}"
233+
vcsTag = "v${->project.version}"
234234
released = new SimpleDateFormat('yyyy-MM-dd\'T\'HH:mm:ss.SSSZZ').format(new Date())
235235
gpg {
236236
sign = true

0 commit comments

Comments
 (0)