From 9a55d0bbf88aeb2157c1ba4addccc2be2564aaaf Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Fri, 6 Jan 2023 17:46:29 +0000 Subject: [PATCH] Fix shadow jars being included in the published dependency set (#107) --- build.gradle | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index fa88ae1..bb29433 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1671313514 +//version: 1673026493 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -46,7 +46,7 @@ buildscript { } dependencies { //Overwrite the current ASM version to fix shading newer than java 8 applicatations. - classpath 'org.ow2.asm:asm-debug-all-custom:5.0.3' + classpath 'org.ow2.asm:asm-debug-all-custom:5.0.3' classpath 'net.minecraftforge.gradle:ForgeGradle:1.2.13' } } @@ -319,9 +319,13 @@ if (file('addon.gradle').exists()) { apply from: 'repositories.gradle' configurations { - implementation.extendsFrom(shadowImplementation) // TODO: remove after all uses are refactored - implementation.extendsFrom(shadowCompile) - implementation.extendsFrom(shadeCompile) + // TODO: remove Compile after all uses are refactored to Implementation + for (config in [shadowImplementation, shadowCompile, shadeCompile]) { + compileClasspath.extendsFrom(config) + runtimeClasspath.extendsFrom(config) + testCompileClasspath.extendsFrom(config) + testRuntimeClasspath.extendsFrom(config) + } } repositories { @@ -350,7 +354,8 @@ dependencies { annotationProcessor('com.google.code.gson:gson:2.8.6') annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.3:processor') if (usesMixinDebug.toBoolean()) { - runtimeOnly('org.jetbrains:intellij-fernflower:1.2.1.16') + runtimeClasspath('org.jetbrains:intellij-fernflower:1.2.1.16') + testRuntimeClasspath('org.jetbrains:intellij-fernflower:1.2.1.16') } } if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {