warning

1 files changed, 29 insertions, 20 deletions

diff --git a/build.gradle.kts b/build.gradle.kts
index 581816e2..a4f214c6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,7 +17,12 @@
  * along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>.
  */
 
+
+import net.fabricmc.loom.task.RemapJarTask
+import org.gradle.internal.impldep.org.apache.ivy.osgi.util.ZipUtil
 import java.io.ByteArrayOutputStream
+import java.nio.file.FileSystems
+import java.nio.file.Files
 
 plugins {
 		idea
@@ -96,15 +101,20 @@ repositories {
 		maven("https://jitpack.io")
 }
 
+val shadowImplementation by configurations.creating {
+		configurations.implementation.get().extendsFrom(this)
+}
+
 dependencies {
 		minecraft("com.mojang:minecraft:1.8.9")
 		mappings("de.oceanlabs.mcp:mcp_stable:22-1.8.9")
 		forge("net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9")
 
-		implementation("org.spongepowered:mixin:0.7.11-SNAPSHOT")
+		shadowImplementation("org.spongepowered:mixin:0.7.11-SNAPSHOT") {
+				isTransitive = false // Dependencies of mixin are already bundled by minecraft
+		}
 		annotationProcessor("org.spongepowered:mixin:0.8.4-SNAPSHOT")
-		implementation("com.fasterxml.jackson.core:jackson-core:2.13.1")
-		implementation("info.bliki.wiki:bliki-core:3.1.0")
+		shadowImplementation("info.bliki.wiki:bliki-core:3.1.0")
 		testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
 		testAnnotationProcessor("org.spongepowered:mixin:0.8.4-SNAPSHOT")
 		//	modImplementation("io.github.notenoughupdates:MoulConfig:0.0.1")
@@ -136,6 +146,7 @@ tasks.withType(Jar::class) {
 				this["MixinConfigs"] = "mixins.notenoughupdates.json"
 				this["FMLCorePluginContainsFMLMod"] = "true"
 				this["ForceLoadAsMod"] = "true"
+				this["Manifest-Version"] = "1.0"
 		}
 }
 
@@ -143,30 +154,28 @@ val remapJar by tasks.named<net.fabricmc.loom.task.RemapJarTask>("remapJar") {
 		archiveClassifier.set("dep")
 		from(tasks.shadowJar)
 		input.set(tasks.shadowJar.get().archiveFile)
+		doLast {
+				this as RemapJarTask
+				@Suppress("Since15") // Not a concern since we build in a modern version of java.
+				val zipFs = FileSystems.newFileSystem(archiveFile.get().asFile.toPath())
+				val moduleInfoPath = zipFs.getPath("/module-info.class")
+				Files.copy(file("src/main/resources/META-INF/versions/9/module-info.class").toPath(), moduleInfoPath)
+				println(Files.exists(moduleInfoPath))
+				zipFs.close()
+		}
 }
 
 tasks.shadowJar {
 		archiveClassifier.set("dep-dev")
-		exclude(
-				"module-info.class", "LICENSE.txt"
-		)
+		configurations = listOf(shadowImplementation)
+		exclude("**/module-info.class", "LICENSE.txt")
 		dependencies {
-				include(dependency("org.spongepowered:mixin"))
-
-				include(dependency("commons-io:commons-io"))
-				include(dependency("org.apache.commons:commons-lang3"))
-				include(dependency("com.fasterxml.jackson.core:jackson-databind:2.10.2"))
-				include(dependency("com.fasterxml.jackson.core:jackson-annotations:2.10.2"))
-				include(dependency("com.fasterxml.jackson.core:jackson-core:2.10.2"))
-
-				include(dependency("info.bliki.wiki:bliki-core:3.1.0"))
-				include(dependency("org.slf4j:slf4j-api:1.7.18"))
-				include(dependency("org.luaj:luaj-jse:3.0.1"))
+				exclude {
+						it.moduleGroup.startsWith("org.apache.") || it.moduleName in
+										listOf("logback-classic", "commons-logging", "commons-codec", "logback-core")
+				}
 		}
 		fun relocate(name: String) = relocate(name, "io.github.moulberry.notenoughupdates.deps.$name")
-		relocate("com.fasterxml.jackson")
-		relocate("org.eclipse")
-		relocate("org.slf4j")
 }
 
 tasks.assemble.get().dependsOn(remapJar)