Refactor snapshot versioning and deployment process v2

(cherry picked from commit 6ffafc5)
JetBrains · Dec 8, 2023 · a19e0bb · a19e0bb
1 parent b580321
commit a19e0bb
Showing 1 changed file with 4 additions and 15 deletions.
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -101,30 +101,19 @@ tasks {
 
     patchPluginXml {
         pluginId = pkgsPluginId
-        version = when {
-            versionString.endsWith("-SNAPSHOT") ->
-                "${versionString.removePrefix("-SNAPSHOT")}.$snapshotMinorVersion"
-
-            else -> versionString
-        }
+        version = versionString.replace("-SNAPSHOT", ".$snapshotMinorVersion")
     }
     val buildShadowPlugin by registering(Zip::class) {
         group = "intellij"
         from(shadowJar) {
-            rename {
-                "package-search-plugin-" + when {
-                    versionString.endsWith("-SNAPSHOT") ->
-                        versionString.replace("-SNAPSHOT", ".$snapshotMinorVersion")
-
-                    else -> versionString
-                } + ".jar"
-            }
+            rename { "packageSearch.jar" }
         }
         from(tooling) {
             rename { "gradle-tooling.jar" }
         }
         into("$pkgsPluginId/lib")
-        archiveFileName = "packagesearch-plugin.zip"
+        archiveFileName = "packageSearch-${project.version}.zip"
+            .replace("-SNAPSHOT", ".$snapshotMinorVersion")
         destinationDirectory = layout.buildDirectory.dir("distributions")
     }