diff --git a/build.gradle b/build.gradle index 86b060d3..10a6e0c0 100644 --- a/build.gradle +++ b/build.gradle @@ -9,8 +9,8 @@ plugins { id 'jacoco' id 'codenarc' id "org.jetbrains.kotlin.jvm" version "1.6.10" // Must match the version included with gradle. - id "com.diffplug.spotless" version "6.11.0" - id "org.gradle.test-retry" version "1.4.1" + id "com.diffplug.spotless" version "6.13.0" + id "org.gradle.test-retry" version "1.5.1" } tasks.withType(JavaCompile).configureEach { @@ -64,8 +64,8 @@ dependencies { // libraries implementation ('commons-io:commons-io:2.11.0') - implementation ('com.google.code.gson:gson:2.10') - implementation ('com.fasterxml.jackson.core:jackson-databind:2.13.4.2') + implementation ('com.google.code.gson:gson:2.10.1') + implementation ('com.fasterxml.jackson.core:jackson-databind:2.14.1') implementation ('com.google.guava:guava:31.1-jre') implementation ('org.ow2.asm:asm:9.4') implementation ('org.ow2.asm:asm-analysis:9.4') @@ -107,14 +107,14 @@ dependencies { testImplementation('org.spockframework:spock-core:2.3-groovy-3.0') { exclude module: 'groovy-all' } - testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.0' - testImplementation ('io.javalin:javalin:5.1.2') { + testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.2' + testImplementation ('io.javalin:javalin:5.3.1') { exclude group: 'org.jetbrains.kotlin' } - testImplementation 'org.mockito:mockito-core:4.8.0' + testImplementation 'org.mockito:mockito-core:5.0.0' - compileOnly 'org.jetbrains:annotations:23.0.0' - testCompileOnly 'org.jetbrains:annotations:23.0.0' + compileOnly 'org.jetbrains:annotations:24.0.0' + testCompileOnly 'org.jetbrains:annotations:24.0.0' testCompileOnly ('net.fabricmc:sponge-mixin:0.11.4+mixin.0.8.5') { transitive = false @@ -160,11 +160,11 @@ spotless { checkstyle { configFile = file('checkstyle.xml') - toolVersion = '10.3.4' + toolVersion = '10.6.0' } codenarc { - toolVersion = "3.1.0" + toolVersion = "3.2.0" configFile = file("codenarc.groovy") } diff --git a/src/main/java/net/fabricmc/loom/util/Constants.java b/src/main/java/net/fabricmc/loom/util/Constants.java index bd5b6d01..715fb591 100644 --- a/src/main/java/net/fabricmc/loom/util/Constants.java +++ b/src/main/java/net/fabricmc/loom/util/Constants.java @@ -95,7 +95,7 @@ public class Constants { public static final String MIXIN_COMPILE_EXTENSIONS = "0.5.0"; public static final String DEV_LAUNCH_INJECTOR = "0.2.1+build.8"; public static final String TERMINAL_CONSOLE_APPENDER = "1.2.0"; - public static final String JETBRAINS_ANNOTATIONS = "23.0.0"; + public static final String JETBRAINS_ANNOTATIONS = "24.0.0"; public static final String NATIVE_SUPPORT_VERSION = "1.0.1"; private Versions() { diff --git a/src/main/kotlin/net/fabricmc/loom/kotlin/remapping/KotlinMetadataRemappingClassVisitor.kt b/src/main/kotlin/net/fabricmc/loom/kotlin/remapping/KotlinMetadataRemappingClassVisitor.kt index e22b05fb..744f2374 100644 --- a/src/main/kotlin/net/fabricmc/loom/kotlin/remapping/KotlinMetadataRemappingClassVisitor.kt +++ b/src/main/kotlin/net/fabricmc/loom/kotlin/remapping/KotlinMetadataRemappingClassVisitor.kt @@ -44,7 +44,7 @@ class KotlinMetadataRemappingClassVisitor(private val remapper: Remapper, next: name: String?, signature: String?, superName: String?, - interfaces: Array? + interfaces: Array?, ) { this.className = name super.visit(version, access, name, signature, superName, interfaces) diff --git a/src/main/kotlin/net/fabricmc/loom/kotlin/remapping/RemappingKmVisitors.kt b/src/main/kotlin/net/fabricmc/loom/kotlin/remapping/RemappingKmVisitors.kt index 7cb9ed04..a777adef 100644 --- a/src/main/kotlin/net/fabricmc/loom/kotlin/remapping/RemappingKmVisitors.kt +++ b/src/main/kotlin/net/fabricmc/loom/kotlin/remapping/RemappingKmVisitors.kt @@ -124,7 +124,7 @@ class RemappingKmVisitors(private val remapper: Remapper) { flags: Flags, name: String, id: Int, - variance: KmVariance + variance: KmVariance, ): KmTypeParameterVisitor { return RemappingKmTypeParameterVisitor(super.visitTypeParameter(flags, name, id, variance)) } @@ -197,7 +197,7 @@ class RemappingKmVisitors(private val remapper: Remapper) { flags: Flags, name: String, id: Int, - variance: KmVariance + variance: KmVariance, ): KmTypeParameterVisitor { return RemappingKmTypeParameterVisitor(super.visitTypeParameter(flags, name, id, variance)) } @@ -254,7 +254,7 @@ class RemappingKmVisitors(private val remapper: Remapper) { flags: Flags, name: String, id: Int, - variance: KmVariance + variance: KmVariance, ): KmTypeParameterVisitor { return RemappingKmTypeParameterVisitor(super.visitTypeParameter(flags, name, id, variance)) } @@ -265,7 +265,7 @@ class RemappingKmVisitors(private val remapper: Remapper) { jvmFlags: Flags, fieldSignature: JvmFieldSignature?, getterSignature: JvmMethodSignature?, - setterSignature: JvmMethodSignature? + setterSignature: JvmMethodSignature?, ) { super.visit(jvmFlags, remapJvmFieldSignature(fieldSignature), remapJvmMethodSignature(getterSignature), remapJvmMethodSignature(setterSignature)) } @@ -314,7 +314,7 @@ class RemappingKmVisitors(private val remapper: Remapper) { flags: Flags, name: String, id: Int, - variance: KmVariance + variance: KmVariance, ): KmTypeParameterVisitor { return RemappingKmTypeParameterVisitor(super.visitTypeParameter(flags, name, id, variance)) } @@ -347,7 +347,7 @@ class RemappingKmVisitors(private val remapper: Remapper) { flags: Flags, name: String, getterFlags: Flags, - setterFlags: Flags + setterFlags: Flags, ): KmPropertyVisitor { return RemappingKmPropertyVisitor(super.visitLocalDelegatedProperty(flags, name, getterFlags, setterFlags)) } @@ -382,7 +382,7 @@ class RemappingKmVisitors(private val remapper: Remapper) { flags: Flags, name: String, getterFlags: Flags, - setterFlags: Flags + setterFlags: Flags, ): KmPropertyVisitor { return RemappingKmPropertyVisitor(super.visitProperty(flags, name, getterFlags, setterFlags)) } @@ -397,7 +397,7 @@ class RemappingKmVisitors(private val remapper: Remapper) { flags: Flags, name: String, getterFlags: Flags, - setterFlags: Flags + setterFlags: Flags, ): KmPropertyVisitor { return RemappingKmPropertyVisitor(super.visitLocalDelegatedProperty(flags, name, getterFlags, setterFlags)) }