Skip to content

Commit

Permalink
fix(gradle): Jar filename didn't use archives_base_name defined in
Browse files Browse the repository at this point in the history
`gradle.properties`
  • Loading branch information
null2264 committed Sep 10, 2024
1 parent 3e0804b commit 8a4b99d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ repositories {
mavenLocal()
}

val archivesBaseName = project.properties["archives_base_name"]
base.archivesBaseName = project.properties["archives_base_name"] as? String ?: ""

val buildNumber: String? = System.getenv("GITHUB_RUN_NUMBER")
project.version = (project.properties["mod_version"] as String? ?: "") + "+${mcVersionStr}" + (if (buildNumber != null) "b${buildNumber}-" else "-") + (project.properties["version_stage"] ?: "") + (if (isFabric) "-fabric" else (if (isNeo) "-neoforge" else "-forge"))
project.version = (project.properties["mod_version"] as? String ?: "") + "+${mcVersionStr}" + (if (buildNumber != null) "b${buildNumber}-" else "-") + (project.properties["version_stage"] ?: "") + (if (isFabric) "-fabric" else (if (isNeo) "-neoforge" else "-forge"))

group = project.properties["maven_group"] as String

Expand Down Expand Up @@ -339,7 +339,7 @@ java {

tasks.jar {
from("LICENSE") {
rename { "${it}_${archivesBaseName}" }
rename { "${it}_${base.archivesBaseName}" }
}
}

Expand Down

0 comments on commit 8a4b99d

Please sign in to comment.