From 38d68817c23f8334105185160be9913e551f5a40 Mon Sep 17 00:00:00 2001 From: TexBlock <3140846162@qq.com> Date: Fri, 6 Sep 2024 23:06:57 +0800 Subject: [PATCH] clean --- build.gradle | 14 -------------- .../gradle/plugin/KessokuGradlePlugin.java | 18 ++++++++++++++++++ registry/neo/build.gradle | 1 - 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index e3d54b9..062e25f 100644 --- a/build.gradle +++ b/build.gradle @@ -99,18 +99,4 @@ subprojects { allprojects { apply plugin: "com.diffplug.spotless" - - configurations { - moduleImplementation { - canBeResolved = true - canBeConsumed = false - } - compileClasspath.extendsFrom moduleImplementation - runtimeClasspath.extendsFrom moduleImplementation - moduleInclude { - canBeResolved = true - canBeConsumed = false - } - include.extendsFrom moduleInclude - } } \ No newline at end of file diff --git a/buildSrc/src/main/java/band/kessoku/gradle/plugin/KessokuGradlePlugin.java b/buildSrc/src/main/java/band/kessoku/gradle/plugin/KessokuGradlePlugin.java index ee2404e..56f9e7d 100644 --- a/buildSrc/src/main/java/band/kessoku/gradle/plugin/KessokuGradlePlugin.java +++ b/buildSrc/src/main/java/band/kessoku/gradle/plugin/KessokuGradlePlugin.java @@ -5,7 +5,16 @@ import org.gradle.api.artifacts.dsl.RepositoryHandler; import org.jetbrains.annotations.NotNull; +import java.util.List; + public class KessokuGradlePlugin implements Plugin { + private static final List NEO_GROUPS = List.of( + "net.neoforged", + "cpw.mods", + "de.oceanlabs", + "net.jodah", + "org.mcmodlauncher" + ); @Override public void apply(@NotNull Project project) { @@ -18,6 +27,15 @@ public void additionalRepositories(RepositoryHandler repositories) { repositories.maven(repo -> { repo.setName("NeoForge"); repo.setUrl("https://maven.neoforged.net/releases/"); + + repo.content(descriptor -> { + NEO_GROUPS.forEach(descriptor::includeGroupAndSubgroups); + }); + + repo.metadataSources(sources -> { + sources.mavenPom(); + sources.ignoreGradleMetadataRedirection(); + }); }); repositories.maven(repo -> { diff --git a/registry/neo/build.gradle b/registry/neo/build.gradle index ca43fa7..589a242 100644 --- a/registry/neo/build.gradle +++ b/registry/neo/build.gradle @@ -10,7 +10,6 @@ loom { dependencies { kessoku.moduleImpl("base", "common") kessoku.moduleImpl("event-base", "neo") - moduleImplementation(project(":event-base-neo")) common(project(path: ':registry-common', configuration: 'namedElements')) { transitive false } shadowBundle(project(path: ':registry-common', configuration: 'transformProductionNeoForge'))