User: rednesto
Date: 13 Sep 24 11:00
Revision: 51342fb8ca9456aafe47a350df0c71063f25da86
Summary:
Fix nightlies version formatting

buildNumber was not included because of a change in the execution order


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9680&personal=false

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision ee67b744a21185e1640f39d7a3faa8e81d3af48e)
+++ build.gradle.kts	(revision 51342fb8ca9456aafe47a350df0c71063f25da86)
@@ -34,7 +34,6 @@
     `mcdev-publishing`
 }
 
-val ideaVersionName: String by project
 val coreVersion: String by project
 
 val gradleToolingExtension: Configuration by configurations.creating
@@ -43,7 +42,6 @@
 }
 
 group = "com.demonwav.mcdev"
-version = "$ideaVersionName-$coreVersion"
 
 val gradleToolingExtensionSourceSet: SourceSet = sourceSets.create("gradle-tooling-extension") {
     configurations.named(compileOnlyConfigurationName) {
Index: buildSrc/src/main/kotlin/mcdev-core.gradle.kts
===================================================================
--- buildSrc/src/main/kotlin/mcdev-core.gradle.kts	(revision ee67b744a21185e1640f39d7a3faa8e81d3af48e)
+++ buildSrc/src/main/kotlin/mcdev-core.gradle.kts	(revision 51342fb8ca9456aafe47a350df0c71063f25da86)
@@ -32,6 +32,17 @@
     id("org.cadixdev.licenser")
 }
 
+val ideaVersionName: String by project
+val coreVersion: String by project
+val buildNumber: String? by project
+
+version = "$ideaVersionName-$coreVersion"
+
+// Build numbers are used for nightlies
+if (buildNumber != null) {
+    version = "$version-$buildNumber"
+}
+
 java {
     toolchain {
         languageVersion.set(JavaLanguageVersion.of(17))
Index: buildSrc/src/main/kotlin/mcdev-publishing.gradle.kts
===================================================================
--- buildSrc/src/main/kotlin/mcdev-publishing.gradle.kts	(revision ee67b744a21185e1640f39d7a3faa8e81d3af48e)
+++ buildSrc/src/main/kotlin/mcdev-publishing.gradle.kts	(revision 51342fb8ca9456aafe47a350df0c71063f25da86)
@@ -23,10 +23,6 @@
 }
 
 tasks.publishPlugin {
-    // Build numbers are used for nightlies
-    properties["buildNumber"]?.let { buildNumber ->
-        project.version = "${project.version}-$buildNumber"
-    }
     properties["mcdev.deploy.token"]?.let { deployToken ->
         token.set(deployToken.toString())
     }
Index: obfuscation-explorer/build.gradle.kts
===================================================================
--- obfuscation-explorer/build.gradle.kts	(revision ee67b744a21185e1640f39d7a3faa8e81d3af48e)
+++ obfuscation-explorer/build.gradle.kts	(revision 51342fb8ca9456aafe47a350df0c71063f25da86)
@@ -26,15 +26,11 @@
     `mcdev-publishing`
 }
 
-val ideaVersionName: String by project
-val coreVersion: String by project
-
 val jflex by configurations
 val jflexSkeleton by configurations
 val grammarKit by configurations
 
 group = "io.mcdev.obfex"
-version = "$ideaVersionName-$coreVersion"
 
 intellijPlatform {
     projectName = "Obfuscation Explorer"