diff --git a/enigma-swing/build.gradle b/enigma-swing/build.gradle index db4b11a65..1ba502abb 100644 --- a/enigma-swing/build.gradle +++ b/enigma-swing/build.gradle @@ -13,7 +13,7 @@ dependencies { implementation libs.jopt implementation libs.flatlaf implementation libs.flatlaf.extras // for SVG icons - implementation libs.quilt.config + implementation libs.bundles.quilt.config implementation libs.swing.dpi implementation libs.fontchooser testImplementation(testFixtures(project(':enigma'))) diff --git a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/Config.java b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/Config.java index 7035e5588..a01390b26 100644 --- a/enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/Config.java +++ b/enigma-swing/src/main/java/org/quiltmc/enigma/gui/config/Config.java @@ -3,7 +3,7 @@ import org.quiltmc.config.api.ReflectiveConfig; import org.quiltmc.config.api.annotations.Comment; import org.quiltmc.config.api.annotations.SerializedName; -import org.quiltmc.config.api.serializer.TomlSerializer; +import org.quiltmc.config.api.serializers.TomlSerializer; import org.quiltmc.config.api.values.ComplexConfigValue; import org.quiltmc.config.api.values.ConfigSerializableObject; import org.quiltmc.config.api.values.TrackedValue; diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0916cd647..83a00a651 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ syntaxpain = "0.1.1" swing_dpi = "0.10" fontchooser = "2.5.2" tinylog = "2.6.2" -quilt_config = "1.2.0-beta.3" +quilt_config = "1.2.0" vineflower = "1.10.0-20230713.053900-2" cfr = "0.2.1" @@ -34,6 +34,7 @@ tinylog_api = { module = "org.tinylog:tinylog-api", version.ref = "tinylog" } tinylog_impl = { module = "org.tinylog:tinylog-impl", version.ref = "tinylog" } quilt_config = { module = "org.quiltmc:quilt-config", version.ref = "quilt_config" } +quilt_config_toml = { module = "org.quiltmc.quilt-config.serializers:toml", version.ref = "quilt_config" } jopt = { module = "net.sf.jopt-simple:jopt-simple", version.ref = "jopt" } flatlaf = { module = "com.formdev:flatlaf", version.ref = "flatlaf" } @@ -55,6 +56,7 @@ jimfs = { module = "com.google.jimfs:jimfs", version.ref = "jimfs" } [bundles] asm = ["asm", "asm_commons", "asm_tree", "asm_util"] tinylog = ["tinylog_api", "tinylog_impl"] +quilt_config = ["quilt_config", "quilt_config_toml"] [plugins] shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }