From e1ef90496f373c79fe34bed5916fc395099db7df Mon Sep 17 00:00:00 2001 From: ByMartrixX <47987888+ByMartrixx@users.noreply.github.com> Date: Mon, 19 Apr 2021 13:00:28 -0400 Subject: [PATCH 1/3] Add loom development dependencies to test runtime classpath (#387) --- .../net/fabricmc/loom/configuration/CompileConfiguration.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index 4fd1a0ad..a3c4b1a7 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -108,6 +108,7 @@ public final class CompileConfiguration { extendsFrom(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME, Constants.Configurations.MAPPINGS_FINAL, project); extendsFrom(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES, project); + extendsFrom(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES, project); } /** From 91d7cc8952abfc4298763a61c2088886d7cb36f5 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 19 Apr 2021 18:00:59 +0100 Subject: [PATCH 2/3] Revert "Add loom development dependencies to test runtime classpath (#387)" (#388) This reverts commit e1ef90496f373c79fe34bed5916fc395099db7df. --- .../net/fabricmc/loom/configuration/CompileConfiguration.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index a3c4b1a7..4fd1a0ad 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -108,7 +108,6 @@ public final class CompileConfiguration { extendsFrom(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME, Constants.Configurations.MAPPINGS_FINAL, project); extendsFrom(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES, project); - extendsFrom(JavaPlugin.TEST_RUNTIME_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.LOOM_DEVELOPMENT_DEPENDENCIES, project); } /** From 43a082597dcc4c1ab4d1bcada0e2ef6b5132ea8c Mon Sep 17 00:00:00 2001 From: shedaniel Date: Wed, 5 May 2021 00:22:51 +0800 Subject: [PATCH 3/3] Migrate to "org.codehaus.groovy:groovy" and change repo order Signed-off-by: shedaniel --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 39c4769a..c30c2dc3 100644 --- a/build.gradle +++ b/build.gradle @@ -46,17 +46,17 @@ sourceSets { } repositories { - maven { url "https://maven.fabricmc.net/" } - maven { url "https://maven.minecraftforge.net/" } - maven { url "https://maven.shedaniel.me/" } mavenCentral() + maven { url "https://maven.fabricmc.net/" } + maven { url "https://maven.architectury.dev/" } + maven { url "https://maven.minecraftforge.net/" } } dependencies { implementation gradleApi() // Compile against groovy 3 to aid with gradle 7 support. Remove when updating to gradle 7 - compileOnly 'org.codehaus.groovy:groovy-all:3.0.7' + compileOnly 'org.codehaus.groovy:groovy:3.0.7' // libraries implementation ('commons-io:commons-io:2.8.0')