Fix Maven

nanite · Jun 9, 2023 · 3778769 · 3778769
1 parent 3b1ff80
commit 3778769
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 2.0.2
+
+- Updated Dependencies
+- Fixed Bugs
+
 ### 2.0.1
 
 - Fix Jar Names

diff --git a/Common/build.gradle b/Common/build.gradle
@@ -4,12 +4,12 @@ plugins {
     id 'maven-publish'
 }
 
+archivesBaseName = "${project.property("mod_name")}-${project.name}"
+
 apply {
     from file("../gradle/scripts/maven.gradle")
 }
 
-archivesBaseName = "${project.property("mod_name")}-${project.name}"
-
 minecraft {
     version(minecraft_version)
 }

diff --git a/Forge/build.gradle b/Forge/build.gradle
@@ -7,12 +7,12 @@ plugins {
     id 'org.spongepowered.mixin' version '0.7-SNAPSHOT'
 }
 
+archivesBaseName = "${project.property("mod_name")}-${project.name}"
+
 apply {
     from file("../gradle/scripts/maven.gradle")
 }
 
-archivesBaseName = "${project.property("mod_name")}-${project.name}"
-
 Project commonProject = parent.project("Common")
 
 def mixinEnabled = project.property("mixinsEnabled") == "true"

diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ subprojects {
     ext.ENV = env
     ext.SNAPSHOT = isSnapshot
 
-    version = "${parent.mod_version}${!isSnapshot ? "-build.${ENV.GITHUB_RUN_NUMBER ?: 9999}": ""}+mc${parent.minecraft_version}${isSnapshot ? '-SNAPSHOT' : ''}"
+    version = "${parent.mod_version}+mc${parent.minecraft_version}${isSnapshot ? '-SNAPSHOT' : ''}"
     group = parent.maven_group
 
     jar {

diff --git a/gradle.properties b/gradle.properties
@@ -24,7 +24,7 @@ fabric_version=0.83.0+1.20
 fabric_loader_version=0.14.21
 
 # Other
-trenzalore_version=2.0.2
+trenzalore_version=2.1.1
 
 # Gradle
 org.gradle.jvmargs=-Xmx3G

diff --git a/gradle/scripts/maven.gradle b/gradle/scripts/maven.gradle
@@ -2,7 +2,7 @@ publishing {
     publications {
         mavenJava(MavenPublication) {
             groupId project.group
-            artifactId project.archivesBaseName + "-" + project.name
+            artifactId project.archivesBaseName
             version project.version
             from components.java
         }