Deduplicate output jar files (#118)

turikhay · Mar 23, 2024 · b0a67e8 · b0a67e8
1 parent ead75ea
commit b0a67e8
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 11 deletions.
diff --git a/buildSrc/src/main/kotlin/ProjectExt.kt b/buildSrc/src/main/kotlin/ProjectExt.kt
@@ -1,5 +1,14 @@
 import org.gradle.api.Project
+import org.gradle.api.Task
+import org.gradle.api.provider.Provider
+import org.gradle.api.tasks.TaskOutputs
+import org.gradle.api.tasks.TaskProvider
 import org.gradle.kotlin.dsl.the
+import java.io.File
 
 // See https://github.com/gradle/gradle/issues/15383
 val Project.libs get() = the<org.gradle.accessors.dm.LibrariesForLibs>()
+
+val Task.singleFile get() = outputs.files.singleFile
+
+val <T : Task> TaskProvider<T>.singleFile get() = map { it.singleFile }
diff --git a/buildSrc/src/main/kotlin/java-shadow.gradle.kts b/buildSrc/src/main/kotlin/java-shadow.gradle.kts
@@ -4,21 +4,30 @@ plugins {
 }
 
 tasks {
-    assemble {
-        dependsOn(shadowJar)
-    }
-
     shadowJar {
         archiveFileName = "MapModCompanion-${
             project.name.replaceFirstChar {
                 it.uppercaseChar()
             }
-        }.jar"
+        }-shadow.jar"
 
         listOf(
             "org.bstats",
         ).forEach { pkg ->
             relocate(pkg, with(rootProject) { "${group}.${name}.shade.${pkg}" })
         }
     }
+
+    val dedupShadowJar = register<Jar>("dedupShadowJar") {
+        dependsOn(shadowJar)
+        from(shadowJar.map { zipTree(it.singleFile) })
+        archiveFileName = shadowJar.map {
+            it.archiveFileName.get().replace("-shadow.jar", ".jar")
+        }
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    }
+
+    assemble {
+        dependsOn(dedupShadowJar)
+    }
 }
diff --git a/packages/single/build.gradle.kts b/packages/single/build.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
     implementation(project(":velocity"))
 }
 
+val dedupShadowJar by tasks.named("dedupShadowJar")
 val semVer = SemVer.parse(project.version as String)
 val isRelease = semVer.preRelease == null
 val updatePages = isRelease || System.getenv("UPDATE_PAGES") == "true"
@@ -42,7 +43,7 @@ modrinth {
     if (updatePages) {
         syncBodyFrom = platformReadme
     }
-    uploadFile = tasks.getByPath("shadowJar")
+    file = dedupShadowJar.singleFile
     gameVersions = allVersions
     loaders.addAll(listOf(
             "bukkit",
@@ -70,7 +71,7 @@ hangarPublish {
         changelog = commonChangelog
         apiKey = System.getenv("HANGAR_TOKEN")
         platforms {
-            val singleJar = tasks.shadowJar.map { it.outputs.files.singleFile }
+            val singleJar = dedupShadowJar.singleFile
             val families = allVersions.map {
                 val split = it.split(".") // -> 1, 20[, 4]
                 assert(split.size > 1)
@@ -110,17 +111,17 @@ hangarPublish {
 
 tasks {
     shadowJar {
-        archiveFileName = "MapModCompanion.jar"
+        archiveFileName = "MapModCompanion-shadow.jar"
     }
     getByName("modrinth") {
         dependsOn(
-                shadowJar,
+                dedupShadowJar,
                 modrinthSyncBody
         )
     }
     getByName("publishPluginPublicationToHangar") {
         dependsOn(
-                shadowJar,
+                dedupShadowJar,
                 getByName("syncAllPluginPublicationPagesToHangar")
         )
     }

diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts
@@ -34,6 +34,6 @@ tasks {
     }
 
     shadowJar {
-        archiveFileName = "mapmodcompanion.jar"
+        archiveFileName = "mapmodcompanion-shadow.jar"
     }
 }