Skip to content

Commit 5ed847b

Browse files
Fox2CodeFox2Code
committed
Update dependencies
1 parent e69f488 commit 5ed847b

File tree

4 files changed

+30
-31
lines changed

4 files changed

+30
-31
lines changed

‎gradle.properties‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ reindev.version=2.9
1919
reindev.version.allowFrom=2.9
2020

2121
# https://plugins.gradle.org/plugin/com.diffplug.spotless
22-
spotless.version=7.0.4
22+
spotless.version=7.2.1
2323

2424
# https://modrinth.com/mod/spark/versions
2525
#Spark properties
26-
spark.dependency=maven.modrinth:spark:1.10.140-fabric
27-
spark.version=1.10.140
26+
spark.dependency=maven.modrinth:spark:1.10.142-fabric
27+
spark.version=1.10.142
2828

2929
# https://mvnrepository.com/artifact/it.unimi.dsi/fastutil-core
3030
fastutil.version=8.5.16
@@ -54,22 +54,22 @@ jvm-downgrader.java-support-max=24
5454

5555
# https://maven.fabricmc.net/net/fabricmc/sponge-mixin/
5656
# Fabric Mixin version
57-
fabric-mixin.version=0.16.1+mixin.0.8.7
57+
fabric-mixin.version=0.16.4+mixin.0.8.7
5858

5959
# https://github.com/LlamaLad7/MixinExtras/releases
6060
# Mixin Extras version
61-
mixin-extras.version=0.4.1
61+
mixin-extras.version=0.5.0
6262

6363
# https://github.com/Bawnorton/MixinSquared/releases
6464
# Mixin Squared version
6565
mixin-squared.version=0.3.3
6666

6767
# https://mvnrepository.com/artifact/com.moulberry/mixinconstraints
68-
mixin-constraints.version=1.0.9
68+
mixin-constraints.version=1.1.0
6969

7070
# https://repo.sleeping.town/blue/endless/jankson/
7171
# Jankson version
72-
jankson.version=2.0.0-SNAPSHOT-23
72+
jankson.version=2.0.0-SNAPSHOT-32
7373

7474
# https://github.com/Fox2Code/ReBuild/releases
7575
rebuild.version=1.1.0
@@ -88,7 +88,7 @@ lwjglx.version=v0.27
8888
jna.version=5.17.0
8989

9090
# https://kotlinlang.org/docs/home.html
91-
kotlin.version=2.2.0
91+
kotlin.version=2.2.10
9292

9393
# https://mvnrepository.com/artifact/org.jetbrains.kotlinx/atomicfu-jvm
9494
kotlinx.atomicfu.version=0.29.0
@@ -100,7 +100,7 @@ kotlinx.collections-immutable.version=0.4.0
100100
kotlinx.coroutines.version=1.10.2
101101

102102
# https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-datetime-jvm
103-
kotlinx.datetime.version=0.7.0
103+
kotlinx.datetime.version=0.7.1
104104

105105
# https://mvnrepository.com/artifact/org.jetbrains.kotlinx/kotlinx-io-core-jvm
106106
kotlinx.io.version=0.8.0

‎loader/src/main/java/com/fox2code/foxloader/config/ConfigIO.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@
2525

2626
import blue.endless.jankson.api.Jankson;
2727
import blue.endless.jankson.api.document.ObjectElement;
28-
import blue.endless.jankson.api.io.JsonReaderOptions;
29-
import blue.endless.jankson.api.io.JsonWriterOptions;
28+
import blue.endless.jankson.api.io.json.JsonReaderOptions;
29+
import blue.endless.jankson.api.io.json.JsonWriterOptions;
30+
import blue.endless.jankson.api.io.style.CommentStyle;
31+
import blue.endless.jankson.api.io.style.WhitespaceStyle;
3032
import com.fox2code.foxloader.loader.ModContainer;
3133
import com.fox2code.foxloader.loader.ModLoader;
3234
import com.fox2code.foxloader.loader.ModLoaderInit;
@@ -37,13 +39,9 @@
3739
import java.util.logging.Level;
3840

3941
public final class ConfigIO {
40-
public static final JsonReaderOptions READER_OPTIONS = new JsonReaderOptions(
41-
// JsonReaderOptions.Hint.ALLOW_BARE_ROOT_OBJECT, JsonReaderOptions.Hint.ALLOW_UNQUOTED_KEYS,
42-
JsonReaderOptions.Hint.MERGE_DUPLICATE_OBJECTS/*, JsonReaderOptions.Hint.ALLOW_KEY_EQUALS_VALUE */);
43-
public static final JsonWriterOptions WRITER_OPTIONS = new JsonWriterOptions(" ",
44-
/*JsonWriterOptions.Hint.BARE_ROOT_OBJECT, JsonWriterOptions.Hint.UNQUOTED_KEYS,
45-
JsonWriterOptions.Hint.KEY_EQUALS_VALUE,*/ JsonWriterOptions.Hint.WRITE_COMMENTS,
46-
JsonWriterOptions.Hint.WRITE_WHITESPACE, JsonWriterOptions.Hint.WRITE_NEWLINES);
42+
public static final JsonReaderOptions.Access READER_OPTIONS = new JsonReaderOptions.Builder().build();
43+
public static final JsonWriterOptions.Access WRITER_OPTIONS = new JsonWriterOptions.Builder()
44+
.setIndentValue(" ").setComments(CommentStyle.ALL).setWhitespace(WhitespaceStyle.PRETTY).build();
4745
private static final String EXTENSION = ".cfg";
4846

4947
private static void readConfigurationImpl(

‎loader/src/main/java/com/fox2code/foxloader/patching/mixin/MixinConstraintsImpl.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,13 @@ protected String getModVersion(String modId) {
4444
}
4545

4646
@Override
47-
protected boolean isVersionInRange(String version, String min, String max) {
47+
protected boolean isVersionInRange(String version, String minVersion, String maxVersion,
48+
boolean minInclusive, boolean maxInclusive) {
4849
FlexVer versionFlex = FlexVer.parse(version);
49-
FlexVer minFlex = FlexVer.parse(version);
50-
FlexVer maxFlex = FlexVer.parse(version);
51-
return versionFlex.isGreaterOrEqual(minFlex) &&
52-
maxFlex.isGreaterOrEqual(versionFlex);
50+
FlexVer minFlex = FlexVer.parse(minVersion);
51+
FlexVer maxFlex = FlexVer.parse(maxVersion);
52+
return (minInclusive ? versionFlex.isGreaterOrEqual(minFlex) : versionFlex.isGreater(minFlex)) &&
53+
(maxInclusive ? maxFlex.isGreaterOrEqual(versionFlex) : maxFlex.isGreater(versionFlex));
5354
}
5455

5556
@Override

‎patching/src/main/java/com/fox2code/foxloader/dependencies/DependencyHelper.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ GSON_DEPENDENCY, new Dependency("com.google.guava:guava:21.0", MAVEN_CENTRAL, "c
8787
new Dependency("com.unascribed:ears-api:" + BuildConfig.EARS_VERSION, UNASCRIBED, "com.unascribed.ears.api.features.EarsFeatures", null, "6482fe4f9473c1b49e0513684e95647a95dca289528b5fdcad3347c193500871"),
8888
new Dependency("com.unascribed:ears-common:" + BuildConfig.EARS_VERSION, UNASCRIBED, "com.unascribed.ears.common.EarsCommon", null, "8ec4fb89e30901abf1f9d35c5ed5ac4d0d57d212dc4f4260566b33fbc826ca0d"),
8989
new Dependency("net.fabricmc:sponge-mixin:" + BuildConfig.FABRIC_MIXIN_VERSION, FABRIC_MC,
90-
"org.spongepowered.asm.mixin.Mixins", null, "349b6fb8b953ac0089ee75a8c9f75003f0ce17632424c95e86701e02d5512c21"),
90+
"org.spongepowered.asm.mixin.Mixins", null, "921a2ca066d82d15d2939efd5eb22754e308db74b1e4277130a76625c3638dfd"),
9191
new Dependency("io.github.llamalad7:mixinextras-common:" + BuildConfig.MIXIN_EXTRAS_VERSION, MAVEN_CENTRAL,
92-
"com.llamalad7.mixinextras.MixinExtrasBootstrap", null, "6a2c6f39f285348635ba1e0e914d066fe718c207e220a49012e8b347cb27fbda"),
92+
"com.llamalad7.mixinextras.MixinExtrasBootstrap", null, "42c6bdf93c12cbf90f5451988dfed763ab8489ce2e40a1d843518b309ff0abaa"),
9393
new Dependency("com.github.bawnorton.mixinsquared:mixinsquared-common:" + BuildConfig.MIXIN_SQUARED_VERSION,
9494
FOX2CODE, "com.bawnorton.mixinsquared.MixinSquaredBootstrap", null, "5ae421a724f2cc9b06ade3da79fb3224e8073fdeac9a35df6f16ae59147a1abb"),
9595
new Dependency("com.fox2code:ReBuild:" + BuildConfig.REBUILD_VERSION, FOX2CODE,
@@ -111,15 +111,15 @@ GSON_DEPENDENCY, new Dependency("com.google.guava:guava:21.0", MAVEN_CENTRAL, "c
111111
public static final Dependency[] commonDependenciesModernJava = new Dependency[]{
112112
new Dependency("blue.endless:jankson:" + BuildConfig.JANKSON_VERSION, SLEEPING_TOWN,
113113
"blue.endless.jankson.api.Jankson", null,
114-
"3816dd5705f4d6e097fca9ddce79baa105931baacd5e4c0912fdb5f1c8c091e3", 21),
114+
"9414a8853e8a359fa551c4cd8d799c6f5458eebac98da0fa7bbca599ec7ab425", 21),
115115
new Dependency("com.moulberry:mixinconstraints:" + BuildConfig.MIXIN_CONSTRAINTS_VERSION,
116116
MAVEN_CENTRAL, "com.moulberry.mixinconstraints.MixinConstraints", null,
117-
"756a8b5d17306a03fe5453767269b7623fb4436c41e0649ec1ca9b203f82f75c", 17),
117+
"67e1fca9cb518f8afb356105c7816587e02880c2acca3bbdb6e08c8e967fc1be", 17),
118118
};
119119

120120
public static final Dependency sparkDependency =
121121
new Dependency(BuildConfig.SPARK_DEPENDENCY, MODRINTH, "me.lucko.spark.common.SparkPlugin",
122-
null, "66d6c264962d6895933bc89287aeac31287ceb085d06bb63b59db8d0b743adaf");
122+
null, "530d544e9c55d97e594e313bcdac5b44239d5b15d0e78af576e2c4d31bd2cd2d");
123123

124124
public static final Dependency vineFlower = new Dependency(
125125
BuildConfig.VINEFLOWER_DEPENDENCY, MAVEN_CENTRAL,
@@ -137,17 +137,17 @@ GSON_DEPENDENCY, new Dependency("com.google.guava:guava:21.0", MAVEN_CENTRAL, "c
137137

138138
public static final Dependency[] kotlinDependencyBundle = new Dependency[]{
139139
new Dependency("org.jetbrains.kotlin:kotlin-reflect:" + BuildConfig.KOTLIN_VERSION,
140-
MAVEN_CENTRAL, "kotlin.reflect.full.KClasses", null, "230d91c2e410e3cfca3a4dc73d255455f62ff52aac091a33397a6e30bde91bf7"),
140+
MAVEN_CENTRAL, "kotlin.reflect.full.KClasses", null, "c48db4f8cd1bfd67f72d59255065fb41bfda43ca2942dac4d9deb897aa126ba4"),
141141
new Dependency("org.jetbrains.kotlin:kotlin-stdlib:" + BuildConfig.KOTLIN_VERSION,
142-
MAVEN_CENTRAL, "kotlin.KotlinVersion", null, "65d12d85a3b865c160db9147851712a64b10dadd68b22eea22a95bf8a8670dca"),
142+
MAVEN_CENTRAL, "kotlin.KotlinVersion", null, "9c67cc79efd6b9215b49d2a4308f5f3433537376c7c88e89bdd6729bd096e61a"),
143143
new Dependency("org.jetbrains.kotlinx:atomicfu-jvm:" + BuildConfig.KOTLINX_ATOMICFU_VERSION,
144144
MAVEN_CENTRAL, "kotlinx.atomicfu.AtomicRef", null, "97cd462f8e8ab92571ab8805070e4450c52cb1ad63c224208f71a10943a01e46"),
145145
new Dependency("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:" + BuildConfig.KOTLINX_COLLECTIONS_IMMUTABLE_VERSION,
146146
MAVEN_CENTRAL, "kotlinx.collections.immutable.ImmutableCollection", null, "d767014ad0c9a27d27d26fd38e7afa030aee0d141338f108781ff02ecf2fdab5"),
147147
new Dependency("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:" + BuildConfig.KOTLINX_COROUTINES_VERSION,
148148
MAVEN_CENTRAL, "kotlinx.coroutines.CoroutineDispatcher", null, "5ca175b38df331fd64155b35cd8cae1251fa9ee369709b36d42e0a288ccce3fd"),
149149
new Dependency("org.jetbrains.kotlinx:kotlinx-datetime-jvm:" + BuildConfig.KOTLINX_DATETIME_VERSION,
150-
MAVEN_CENTRAL, "kotlinx.datetime.DateTimeUnit", null, "56d7d4d86372cb3da402c8b66f226b9283182810a667a09ca0e522b4ff992087"),
150+
MAVEN_CENTRAL, "kotlinx.datetime.DateTimeUnit", null, "3b8b98657c9aff3be7f6b4b575e9f3fb9a3a1f452a801da0f438901734acdade"),
151151
new Dependency("org.jetbrains.kotlinx:kotlinx-io-bytestring-jvm:" + BuildConfig.KOTLINX_IO_VERSION,
152152
MAVEN_CENTRAL, "kotlinx.io.bytestring.ByteString", null, "3da805e9da2ff3cb119f744dcd11de6a18e32a5b933518f17418ba5795cfa775"),
153153
new Dependency("org.jetbrains.kotlinx:kotlinx-io-core-jvm:" + BuildConfig.KOTLINX_IO_VERSION,

0 commit comments

Comments
 (0)