From 47d372e77fa31b6a6eef56cce1eb5a5e3b942b8e Mon Sep 17 00:00:00 2001 From: Andrew Snare Date: Sun, 30 Apr 2017 17:32:53 +0200 Subject: [PATCH] Upgrade to the current version of the release plugin. --- build.gradle | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index b2664fd5..7b3066be 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ buildscript { plugins { id 'java' id 'com.github.johnrengelman.shadow' version '1.2.4' - id 'pl.allegro.tech.build.axion-release' version '1.4.1' + id 'pl.allegro.tech.build.axion-release' version '1.6.0' } apply plugin: 'java' @@ -42,17 +42,11 @@ apply plugin: 'groovy' apply plugin: 'com.github.ben-manes.versions' apply plugin: 'pl.allegro.tech.build.axion-release' -import com.github.zafarkhaja.semver.Version - scmVersion { tag { prefix = rootProject.name } - versionCreator { versionFromTag, scmPosition -> - scmPosition.onTag || scmPosition.branch.startsWith('support/') - ? versionFromTag - : Version.valueOf(versionFromTag).incrementMinorVersion() - } + versionIncrementer 'incrementMinorIfNotOnRelease', [releaseBranchPattern: 'support/.*'] } defaultTasks 'clean', 'build'