mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2026-02-07 19:30:16 +00:00
Fix more issues caused by Java 25 update
- Bump CC:T Javadoc version, to fix issues with dropping newlines when converting to Markdown. I'd originally planned to switch to Markdown-style Javadocs, but tooling is stil a bit lacking (Intelli's formatting of @params is entirely broken for instance). - Force more recent ASM version, to allow Forge to run.
This commit is contained in:
@@ -161,7 +161,7 @@ tasks.javadoc {
|
||||
options {
|
||||
val stdOptions = this as StandardJavadocDocletOptions
|
||||
stdOptions.addBooleanOption("Xdoclint:all,-missing", true)
|
||||
stdOptions.links("https://docs.oracle.com/en/java/javase/21/docs/api/")
|
||||
stdOptions.links("https://docs.oracle.com/en/java/javase/${CCTweakedPlugin.JAVA_TARGET.asInt()}/docs/api/")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ netty = "4.1.82.Final"
|
||||
slf4j = "2.0.1"
|
||||
|
||||
# Core dependencies (independent of Minecraft)
|
||||
asm = "9.9"
|
||||
asm = "9.9.1"
|
||||
autoService = "1.1.1"
|
||||
checkerFramework = "3.51.1"
|
||||
cobalt = { strictly = "0.9.7" }
|
||||
@@ -57,7 +57,7 @@ junitPlatform = "6.0.1"
|
||||
jmh = "1.37"
|
||||
|
||||
# Build tools
|
||||
cctJavadoc = "1.8.5"
|
||||
cctJavadoc = "1.9.0"
|
||||
checkstyle = "12.1.1"
|
||||
errorProne-core = "2.45.0"
|
||||
errorProne-plugin = "4.3.0"
|
||||
|
||||
@@ -124,6 +124,9 @@ legacyForge {
|
||||
}
|
||||
|
||||
configurations {
|
||||
// Force a more recent version of ASM, so we're compatible with Java 25.
|
||||
configureEach { resolutionStrategy.force(libs.asm) }
|
||||
|
||||
additionalRuntimeClasspath { extendsFrom(jarJar.get()) }
|
||||
|
||||
val testAdditionalRuntimeClasspath by registering {
|
||||
|
||||
Reference in New Issue
Block a user