fix jar versioning

sisby-folk · Sep 21, 2023 · aecb7f3 · aecb7f3
1 parent b1ac8bd
commit aecb7f3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/buildSrc/src/main/groovy/switchy.compilation.gradle b/buildSrc/src/main/groovy/switchy.compilation.gradle
@@ -3,6 +3,7 @@ plugins {
 }
 
 archivesBaseName = project == rootProject ? project.name : rootProject.name + '-' + project.name
+version = "$project.version+$project.branch"
 
 java {
 	targetCompatibility = sourceCompatibility = JavaVersion.VERSION_17
@@ -15,8 +16,6 @@ tasks.withType(JavaCompile).configureEach {
 }
 
 tasks.withType(Jar).configureEach {
-	archiveVersion = "${project.version}+${libs.versions.mc.get()}"
-
 	from("LICENSE.txt") {
 		rename { "${it}_${archivesBaseName}" }
 	}

diff --git a/buildSrc/src/main/groovy/switchy.publishing.gradle b/buildSrc/src/main/groovy/switchy.publishing.gradle
@@ -7,7 +7,7 @@ publishing {
 		mavenJava(MavenPublication) {
 			from components.java
 			artifactId "switchy" + '-' + project.name
-			version "${project.version}+${libs.versions.mc.get()}"
+			version "$project.version+$project.branch"
 		}
 	}
 

diff --git a/buildSrc/src/main/groovy/switchy.releasing.gradle b/buildSrc/src/main/groovy/switchy.releasing.gradle
@@ -25,8 +25,8 @@ tasks.githubRelease {
 modrinth {
 	token = project.findProperty("modrinth.token") ?: System.getenv("MODRINTH_TOKEN")
 	projectId = 'switchy'
-	versionNumber = project.version
-	versionName = "$project.version+${libs.versions.mc.get()}"
+	versionName = project.version
+	versionNumber = "$project.version+$project.branch"
 	versionType = 'release'
 	uploadFile = remapJar
 	gameVersions = [libs.versions.mc]

diff --git a/gradle.properties b/gradle.properties
@@ -8,4 +8,5 @@ org.gradle.configureondemand=true
 fabric.loom.multiProjectOptimisation=true
 # Mod Properties
 version=2.8.3
+branch=1.19
 default_release_branch=1.19