From e4b15f4dd9089f61ca9bf8042fcb0d039f15b591 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Wed, 24 Jun 2020 23:50:02 -0400 Subject: [PATCH] 1.0.9 --- CHANGELOG.md | 3 +++ build.gradle | 37 +++++++++++++++++-------------------- gradle.properties | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 067d1d8..ff2639e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +**1.0.9** +* Fix Transitive Dependencies + **1.0.8** * Remove Debug Code diff --git a/build.gradle b/build.gradle index 3d516b7..bc35262 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,6 @@ plugins { id 'fabric-loom' version '0.4-SNAPSHOT' id 'com.matthewprenger.cursegradle' version '1.4.0' - id "com.github.johnrengelman.shadow" version "5.2.0" } compileJava { @@ -13,6 +12,12 @@ def mod_version = project.mod_version as Object version = "${mod_version}+${project.minecraft_version}" group = project.maven_group as Object +configurations { + includeTransitive { + transitive = true + } +} + dependencies { minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings "net.fabricmc:yarn:${project.minecraft_version}+build.${project.yarn_build}:v2" @@ -23,31 +28,23 @@ dependencies { modImplementation "io.github.prospector:modmenu:${project.modmenu_version}" implementation "com.squareup.moshi:moshi:${project.moshi_version}" - shadow "com.squareup.moshi:moshi:${project.moshi_version}" + includeTransitive "com.squareup.moshi:moshi:${project.moshi_version}" implementation "org.dom4j:dom4j:${project.dom4j_version}" - shadow "org.dom4j:dom4j:${project.dom4j_version}" + includeTransitive "org.dom4j:dom4j:${project.dom4j_version}" compileOnly 'com.google.code.findbugs:jsr305:3.0.2' } -shadowJar { - configurations = [project.configurations.shadow] - classifier 'shadow-dev' - mergeServiceFiles() -} - -import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation - -task relocateShadowJar(type: ConfigureShadowRelocation) { - target = tasks.shadowJar - prefix = "${project.group}.${project.archivesBaseName}.shadow" -} -tasks.shadowJar.dependsOn tasks.relocateShadowJar - -remapJar { - dependsOn shadowJar - input.set shadowJar.archiveFile.get() +project.afterEvaluate { + configurations.includeTransitive.incoming.resolutionResult.allComponents { + if (it.id instanceof ModuleComponentIdentifier) { + def that = it + dependencies { + include group: that.id.getGroup(), name: that.id.getModule(), version: that.id.getVersion() + } + } + } } processResources { diff --git a/gradle.properties b/gradle.properties index 13fb52e..b695e47 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ org.gradle.jvmargs = -Xmx1G fabric_loader_version = 0.8.8+build.202 # Mod Properties - mod_version = 1.0.8 + mod_version = 1.0.9 maven_group = com.thebrokenrail # Dependencies