From d358283ed8af08e7eb70284deb9ce8dd9521ab65 Mon Sep 17 00:00:00 2001 From: "sevastian.zhukov" Date: Thu, 19 Jan 2023 20:48:37 +0700 Subject: [PATCH 1/2] Set patch version for snapshots --- gradle/artifact-settings.gradle | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gradle/artifact-settings.gradle b/gradle/artifact-settings.gradle index b8cdc5a142d..db5850edbc0 100644 --- a/gradle/artifact-settings.gradle +++ b/gradle/artifact-settings.gradle @@ -42,8 +42,9 @@ def getSnapshotVersion(String version) { def matcher = version =~ /$prefix(\d+)\.(\d+)\.(\d+.*)/ def major = (matcher[0][1] as Integer) def isPreRelease + def patch = "0" try { - Integer.parseInt(matcher[0][3]) + patch = Integer.parseInt(matcher[0][3]) isPreRelease = false } catch (NumberFormatException ignored) { isPreRelease = true @@ -54,9 +55,9 @@ def getSnapshotVersion(String version) { } def branch = System.getenv("CIRCLE_BRANCH") if (!branch || branch == "main" || branch ==~ /release-v.*/) { - return "${major}.${minor}.0-SNAPSHOT" + return "${major}.${minor}.${patch}-SNAPSHOT" } else { - return "${major}.${minor}.0-${branch}-SNAPSHOT" + return "${major}.${minor}.${patch}-${branch}-SNAPSHOT" } } } From db85fb2b5a63ee1390061a6e1f0e8a4f967c064e Mon Sep 17 00:00:00 2001 From: "sevastian.zhukov" Date: Thu, 19 Jan 2023 20:49:59 +0700 Subject: [PATCH 2/2] Change patch type --- gradle/artifact-settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/artifact-settings.gradle b/gradle/artifact-settings.gradle index db5850edbc0..d121db60243 100644 --- a/gradle/artifact-settings.gradle +++ b/gradle/artifact-settings.gradle @@ -42,7 +42,7 @@ def getSnapshotVersion(String version) { def matcher = version =~ /$prefix(\d+)\.(\d+)\.(\d+.*)/ def major = (matcher[0][1] as Integer) def isPreRelease - def patch = "0" + def patch = 0 try { patch = Integer.parseInt(matcher[0][3]) isPreRelease = false