Update to target java 25

Author: noeppi-noeppi

build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = 'org.moddingx'
-java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+java.toolchain.languageVersion = JavaLanguageVersion.of(25)
 
 configurations {
     lib
@@ -33,8 +33,8 @@ repositories {
 }
 
 dependencies {
-    lib 'org.ow2.asm:asm:9.8'
-    lib 'org.ow2.asm:asm-tree:9.8'
+    lib 'org.ow2.asm:asm:9.9.1'
+    lib 'org.ow2.asm:asm-tree:9.9.1'
     libImpl 'jakarta.annotation:jakarta.annotation-api:3.0.0'
     libImpl 'net.sf.jopt-simple:jopt-simple:5.0.4'
     implementation sourceSets.lib.output
@@ -51,39 +51,46 @@ gradlePlugin {
     }
 }
 
-jar {
+tasks.named('jar', Jar).configure { task ->
     from sourceSets.lib.output
-    manifest {
+    task.manifest {
         attributes 'Main-Class': application.mainClass.get()
     }
 }
 
-task fatjar(type: Jar) {
+var fatJar = tasks.register('fatjar', Jar) { task ->
     archiveClassifier = 'fatjar'
-    manifest = jar.manifest
-    with jar
-}
-build.dependsOn fatjar
+    manifest = tasks.named('jar', Jar).get().manifest
+    with tasks.named('jar', Jar).get()
 
-task configureFatJar {
-    doLast {
-        configurations.libResolvable.each { dep ->
-            fatjar.from(project.zipTree(dep)) {
-                exclude 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA', 'module-info.class'
-                duplicatesStrategy DuplicatesStrategy.INCLUDE
-            }
+    configurations.runtimeClasspath.each { dep ->
+        task.from(project.zipTree(dep)) {
+            exclude 'META-INF/MANIFEST.MF', 'META-INF/INDEX.LIST'
+            exclude 'module-info.class', 'META-INF/versions/*/module-info.class'
+            exclude 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA', 'META-INF/SIG-*'
+            exclude 'META-INF/README*', 'META-INF/LICENSE*', 'META-INF/NOTICE*'
+            exclude 'META-INF/readme*', 'META-INF/license*', 'META-INF/notice*'
+            duplicatesStrategy DuplicatesStrategy.FAIL
+        }
+        task.from(project.zipTree(dep)) {
+            include 'META-INF', 'META-INF/**', 'module-info.class'
+            into "META-INF/libraries/${dep.name.replaceAll('\\.jar$', '')}/"
+            duplicatesStrategy DuplicatesStrategy.FAIL
         }
     }
-    outputs.upToDateWhen { false }
 }
-fatjar.dependsOn configureFatJar
 
-task sourcesJar(type: Jar, dependsOn: classes) {
+var sourcesJar = tasks.register('sourcesJar', Jar) {
     archiveClassifier = 'sources'
     from sourceSets.lib.allSource
     from sourceSets.main.allSource
+    dependsOn tasks.named('classes')
+}
+
+tasks.named('build').configure { task ->
+    task.dependsOn fatJar
+    task.dependsOn sourcesJar
 }
-build.dependsOn sourcesJar
 
 publishing {
     publications {

src/main/java/org/moddingx/ljc/LanguageLevel.java

@@ -33,8 +33,9 @@ public enum LanguageLevel {
     JAVA_21(21, Opcodes.ASM9, Opcodes.V21, 'L', DynamicSwitchPatterns::new, MatchExceptionFixer::new),
     JAVA_22(22, Opcodes.ASM9, Opcodes.V22, 'M'),
     JAVA_23(23, Opcodes.ASM9, Opcodes.V23, 'N'),
-    JAVA_24(24, Opcodes.ASM9, Opcodes.V24, 'O');
-    
+    JAVA_24(24, Opcodes.ASM9, Opcodes.V24, 'O'),
+    JAVA_25(25, Opcodes.ASM9, Opcodes.V25, 'P');
+
     private static final int TARGET_ASM = Opcodes.ASM9;
 
     public final int version;