Skip to content

Commit 51342fb

Browse files
committed
Fix nightlies version formatting
buildNumber was not included because of a change in the execution order
1 parent ee67b74 commit 51342fb

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ plugins {
3434
`mcdev-publishing`
3535
}
3636

37-
val ideaVersionName: String by project
3837
val coreVersion: String by project
3938

4039
val gradleToolingExtension: Configuration by configurations.creating
@@ -43,7 +42,6 @@ val testLibs: Configuration by configurations.creating {
4342
}
4443

4544
group = "com.demonwav.mcdev"
46-
version = "$ideaVersionName-$coreVersion"
4745

4846
val gradleToolingExtensionSourceSet: SourceSet = sourceSets.create("gradle-tooling-extension") {
4947
configurations.named(compileOnlyConfigurationName) {

buildSrc/src/main/kotlin/mcdev-core.gradle.kts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,17 @@ plugins {
3232
id("org.cadixdev.licenser")
3333
}
3434

35+
val ideaVersionName: String by project
36+
val coreVersion: String by project
37+
val buildNumber: String? by project
38+
39+
version = "$ideaVersionName-$coreVersion"
40+
41+
// Build numbers are used for nightlies
42+
if (buildNumber != null) {
43+
version = "$version-$buildNumber"
44+
}
45+
3546
java {
3647
toolchain {
3748
languageVersion.set(JavaLanguageVersion.of(17))

buildSrc/src/main/kotlin/mcdev-publishing.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ plugins {
2323
}
2424

2525
tasks.publishPlugin {
26-
// Build numbers are used for nightlies
27-
properties["buildNumber"]?.let { buildNumber ->
28-
project.version = "${project.version}-$buildNumber"
29-
}
3026
properties["mcdev.deploy.token"]?.let { deployToken ->
3127
token.set(deployToken.toString())
3228
}

obfuscation-explorer/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,11 @@ plugins {
2626
`mcdev-publishing`
2727
}
2828

29-
val ideaVersionName: String by project
30-
val coreVersion: String by project
31-
3229
val jflex by configurations
3330
val jflexSkeleton by configurations
3431
val grammarKit by configurations
3532

3633
group = "io.mcdev.obfex"
37-
version = "$ideaVersionName-$coreVersion"
3834

3935
intellijPlatform {
4036
projectName = "Obfuscation Explorer"

0 commit comments

Comments
 (0)