Fix multiple quilt config classes being on the classpath, leading to …

…some classes being missing. (#407)
QuiltMC · Feb 18, 2024 · 5837550 · 5837550
1 parent 5134f89
commit 5837550
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/build.gradle b/build.gradle
@@ -73,7 +73,9 @@ sourceSets {
 }
 
 configurations {
-	include
+	include {
+	   transitive = false
+	}
 
 	implementation {
 		extendsFrom include
@@ -111,13 +113,17 @@ dependencies {
 	include "org.quiltmc.quilt-config.serializers:json5:${project.quilt_config}"
 	api "org.quiltmc:quilt-config:${project.quilt_config}"
 
+	include "com.electronwill.night-config:core:${project.night_config}"
+	include "com.electronwill.night-config:toml:${project.night_config}"
+	shadow "com.electronwill.night-config:core:${project.night_config}"
+	shadow "com.electronwill.night-config:toml:${project.night_config}"
+
 	development "io.github.llamalad7:mixinextras-fabric:$mixin_extras"
 
 	// also must update in minecraft AND minecraft test
 	compileOnly "org.quiltmc.chasm:chasm:${project.quilt_chasm}"
 	compileOnly "org.quiltmc.chasm:chassembly:${project.quilt_chasm}"
 
-
 	shadow "org.quiltmc.quilt-config.serializers:toml:${project.quilt_config}"
 	shadow "org.quiltmc.quilt-config.serializers:json5:${project.quilt_config}"
 	shadow "org.quiltmc.parsers:json:${project.quilt_parsers}"

diff --git a/src/main/resources/fabric-installer.launchwrapper.json b/src/main/resources/fabric-installer.launchwrapper.json
@@ -50,14 +50,6 @@
       {
         "name": "org.quiltmc:quilt-config:${quilt_config}",
         "url": "https://maven.quiltmc.org/repository/release/"
-      },
-      {
-        "name": "org.quiltmc.quilt-config.serializers:json5:${quilt_config}",
-        "url": "https://maven.quiltmc.org/repository/release/"
-      },
-      {
-        "name": "org.quiltmc.quilt-config.serializers:toml:${quilt_config}",
-        "url": "https://maven.quiltmc.org/repository/release/"
       }
     ],
     "server": [

diff --git a/src/main/resources/quilt_installer.json b/src/main/resources/quilt_installer.json
@@ -48,14 +48,6 @@
       {
         "name": "org.quiltmc:quilt-config:${quilt_config}",
         "url": "https://maven.quiltmc.org/repository/release/"
-      },
-      {
-        "name": "org.quiltmc.quilt-config.serializers:json5:${quilt_config}",
-        "url": "https://maven.quiltmc.org/repository/release/"
-      },
-      {
-        "name": "org.quiltmc.quilt-config.serializers:toml:${quilt_config}",
-        "url": "https://maven.quiltmc.org/repository/release/"
       }
     ],
     "server": [