From 1ea5dbb1e8ea5d41852feeea28b713f5acb5654d Mon Sep 17 00:00:00 2001 From: shedaniel Date: Mon, 14 Jun 2021 02:16:12 +0800 Subject: [PATCH 1/2] Try switching to a regex and exclude in the repo that loom adds Signed-off-by: shedaniel --- build.gradle | 5 +++-- src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index e0a60edc..fac2e5b5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,5 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import org.w3c.dom.Document plugins { id 'java' @@ -56,8 +57,8 @@ repositories { maven { url "https://maven.architectury.dev/" } maven { url "https://maven.minecraftforge.net/" - content{ - excludeGroupByRegex "org.eclipse.*" + content { + excludeGroupByRegex "org\\.eclipse\\.?.*" } } } diff --git a/src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java b/src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java index 3dc6c44f..de242a72 100644 --- a/src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java +++ b/src/main/java/net/fabricmc/loom/LoomRepositoryPlugin.java @@ -79,6 +79,9 @@ public class LoomRepositoryPlugin implements Plugin { repo.setName("Forge"); repo.setUrl("https://maven.minecraftforge.net/"); + repo.content(descriptor -> { + descriptor.excludeGroupByRegex("org\\.eclipse\\.?.*"); + }); repo.metadataSources(sources -> { sources.mavenPom(); sources.ignoreGradleMetadataRedirection(); From 99775c20690694e1b7ac80e049681fd60187bfd6 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 17 Jun 2021 23:41:46 +0800 Subject: [PATCH 2/2] Make compileForgeInjectJava build for Java 8 Signed-off-by: shedaniel --- build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index fac2e5b5..461ea788 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,6 @@ tasks.withType(JavaCompile).configureEach { it.options.release = 16 } - group = "dev.architectury" archivesBaseName = project.name def baseVersion = '0.8.0' @@ -51,6 +50,10 @@ sourceSets { forgeInject } +tasks.compileForgeInjectJava { + options.release = 8 +} + repositories { mavenCentral() maven { url "https://maven.fabricmc.net/" }