From 60eec5f37fb0f0e8cc6e8ce13492c04282830e5d Mon Sep 17 00:00:00 2001 From: "Vassiliy.Kudryashov" Date: Thu, 6 Oct 2022 16:03:01 +0300 Subject: [PATCH 1/2] Make snapshot version calendar-dependant --- build.gradle.kts | 3 ++- utbot-intellij/build.gradle.kts | 2 ++ utbot-intellij/src/main/resources/META-INF/plugin.xml | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e654a026c9..654c06dc98 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,4 @@ +import java.text.SimpleDateFormat import org.gradle.api.JavaVersion.VERSION_11 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -9,7 +10,7 @@ val coroutinesVersion: String by project val collectionsVersion: String by project val junit5Version: String by project -version = semVer ?: "1.0-SNAPSHOT" +version = semVer ?: "${SimpleDateFormat("YYYY.MM").format(System.currentTimeMillis())}-SNAPSHOT" plugins { `java-library` diff --git a/utbot-intellij/build.gradle.kts b/utbot-intellij/build.gradle.kts index d27a08588e..4d5571c915 100644 --- a/utbot-intellij/build.gradle.kts +++ b/utbot-intellij/build.gradle.kts @@ -7,6 +7,7 @@ val pythonCommunityPluginVersion: String? by rootProject val pythonUltimatePluginVersion: String? by rootProject val sootCommitHash: String? by rootProject val kryoVersion: String? by rootProject +val semVer: String? by rootProject plugins { id("org.jetbrains.intellij") version "1.7.0" @@ -68,6 +69,7 @@ tasks { patchPluginXml { sinceBuild.set("212") untilBuild.set("222.*") + version.set(semVer) } } diff --git a/utbot-intellij/src/main/resources/META-INF/plugin.xml b/utbot-intellij/src/main/resources/META-INF/plugin.xml index a5972aa021..81f3409165 100644 --- a/utbot-intellij/src/main/resources/META-INF/plugin.xml +++ b/utbot-intellij/src/main/resources/META-INF/plugin.xml @@ -4,9 +4,6 @@ org.utbot.intellij.plugin.id UnitTestBot utbot.org - - - 2022.7-beta com.intellij.modules.platform com.intellij.modules.java org.jetbrains.kotlin From 94797f4ceb3d64ed3c52ba8a0683ee5929fd1f33 Mon Sep 17 00:00:00 2001 From: "Vassiliy.Kudryashov" Date: Thu, 6 Oct 2022 16:27:54 +0300 Subject: [PATCH 2/2] Make snapshot version calendar-dependant --- build.gradle.kts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 654c06dc98..88722424cb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,8 +9,9 @@ val semVer: String? by project val coroutinesVersion: String by project val collectionsVersion: String by project val junit5Version: String by project +val dateBasedVersion: String = SimpleDateFormat("YYYY.MM").format(System.currentTimeMillis()) // CI proceeds the same way -version = semVer ?: "${SimpleDateFormat("YYYY.MM").format(System.currentTimeMillis())}-SNAPSHOT" +version = semVer ?: "$dateBasedVersion-SNAPSHOT" plugins { `java-library`