fix(v2): fix publishing + tweak gitignore

ANutley · Aug 1, 2023 · 30580bc · 30580bc
1 parent 4f2e9a8
commit 30580bc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 .gradle
-/build/
-config.yml
+*build/
+/config/
+/jars/
 
 # Ignore Gradle GUI config
 gradle-app.setting

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,6 +12,10 @@ plugins {
 
 }
 
+allprojects {
+    project.extra.set("artifactId", (if (rootProject == project) project.name else "${rootProject.name}-${project.name}").toLowerCase())
+}
+
 subprojects {
     apply(plugin = "java")
     apply(plugin = "maven-publish")
@@ -22,9 +26,6 @@ subprojects {
 
     tasks {
         withType<Jar> {
-            archiveVersion.set("${project.properties["version"]}")
-
-            archiveClassifier.set("unshaded")
             archiveFileName.set("DisLink-${archiveBaseName.get().capitalized()}-${archiveVersion.get()}-unshaded.jar")
         }
 
@@ -67,6 +68,7 @@ subprojects {
         publications {
             create<MavenPublication>("maven") {
                 from(components["java"])
+                artifactId = project.extra.get("artifactId").toString()
             }
         }