Fix nightlies version formatting

buildNumber was not included because of a change in the execution order
minecraft-dev · Sep 13, 2024 · 51342fb · 51342fb
1 parent ee67b74
commit 51342fb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -34,7 +34,6 @@ plugins {
     `mcdev-publishing`
 }
 
-val ideaVersionName: String by project
 val coreVersion: String by project
 
 val gradleToolingExtension: Configuration by configurations.creating
@@ -43,7 +42,6 @@ val testLibs: Configuration by configurations.creating {
 }
 
 group = "com.demonwav.mcdev"
-version = "$ideaVersionName-$coreVersion"
 
 val gradleToolingExtensionSourceSet: SourceSet = sourceSets.create("gradle-tooling-extension") {
     configurations.named(compileOnlyConfigurationName) {

diff --git a/buildSrc/src/main/kotlin/mcdev-core.gradle.kts b/buildSrc/src/main/kotlin/mcdev-core.gradle.kts
@@ -32,6 +32,17 @@ plugins {
     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))

diff --git a/buildSrc/src/main/kotlin/mcdev-publishing.gradle.kts b/buildSrc/src/main/kotlin/mcdev-publishing.gradle.kts
@@ -23,10 +23,6 @@ plugins {
 }
 
 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())
     }

diff --git a/obfuscation-explorer/build.gradle.kts b/obfuscation-explorer/build.gradle.kts
@@ -26,15 +26,11 @@ plugins {
     `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"