Merge remote-tracking branch 'origin/main' into feature/better-versio…

…ning
PaperMC · Dec 30, 2024 · 4f7f48e · 4f7f48e
2 parents 72f505f + a1eb6a3
commit 4f7f48e
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,14 +1,14 @@
 [versions]
-asm = "9.6"
-junit = "5.11.1"
+asm = "9.7.1"
+junit = "5.11.4"
 indra = "3.1.3"
 
 jbAnnos = "24.1.0"
 
 [libraries]
 asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
 asmCommons = { module = "org.ow2.asm:asm-commons", version.ref = "asm" }
-checkerQual = "org.checkerframework:checker-qual:3.47.0"
+checkerQual = "org.checkerframework:checker-qual:3.48.0"
 jetbrainsAnnotations = { module = "org.jetbrains:annotations", version.ref = "jbAnnos" }
 
 jupiterApi = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
@@ -19,4 +19,4 @@ jupiterParams = { module = "org.junit.jupiter:junit-jupiter-params", version.ref
 indra = { id = "net.kyori.indra", version.ref = "indra" }
 indraCheckstyle = { id = "net.kyori.indra.checkstyle", version.ref = "indra" }
 indraPublishing = { id = "net.kyori.indra.publishing", version.ref = "indra" }
-javadocLinks = { id = "org.incendo.cloud-build-logic.javadoc-links", version = "0.0.15" }
+javadocLinks = { id = "org.incendo.cloud-build-logic.javadoc-links", version = "0.0.16" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
 }
 
 rootProject.name = "asm-utils"

diff --git a/src/test/java/io/papermc/asm/rules/classes/ClassToInterfaceTest.java b/src/test/java/io/papermc/asm/rules/classes/ClassToInterfaceTest.java
@@ -8,7 +8,7 @@
 
 class ClassToInterfaceTest {
 
-    @TransformerTest(value = "data.classes.ClassToInterfaceUser", copyFromClassReader = false /*required until asm merges https://gitlab.ow2.org/asm/asm/-/merge_requests/403*/)
+    @TransformerTest("data.classes.ClassToInterfaceUser")
     void testWithNoReplacement(final TransformerCheck check) {
         final RewriteRule rule = new ClassToInterfaceRule(
             SomeAbstractClass.class.describeConstable().orElseThrow(),
@@ -18,7 +18,7 @@ void testWithNoReplacement(final TransformerCheck check) {
         check.run(rule);
     }
 
-    @TransformerTest(value = "data.classes.ClassToInterfaceRedirectUser", copyFromClassReader = false /*required until asm merges https://gitlab.ow2.org/asm/asm/-/merge_requests/403*/)
+    @TransformerTest("data.classes.ClassToInterfaceRedirectUser")
     void testWithReplacement(final TransformerCheck check) {
         final RewriteRule rule = new ClassToInterfaceRule(
             SomeAbstractClass.class.describeConstable().orElseThrow(),

diff --git a/src/test/java/io/papermc/asm/rules/classes/EnumToInterfaceTest.java b/src/test/java/io/papermc/asm/rules/classes/EnumToInterfaceTest.java
@@ -15,7 +15,7 @@ class EnumToInterfaceTest {
     private static final ClassDesc API_ENUM = desc(ApiEnum.class);
     private static final ClassDesc API_ENUM_IMPL = desc(ApiEnumImpl.class);
 
-    @TransformerTest(value = "data.classes.EnumToInterfaceUser", copyFromClassReader = false)
+    @TransformerTest("data.classes.EnumToInterfaceUser")
     void testEnumToInterface(final TransformerCheck check) {
         final RewriteRule rule = new EnumToInterfaceRule(Map.of(API_ENUM, API_ENUM_IMPL));
 

diff --git a/src/testData/resources/expected/data/classes/ClassToInterfaceRedirectUser.class b/src/testData/resources/expected/data/classes/ClassToInterfaceRedirectUser.class
diff --git a/src/testData/resources/expected/data/classes/ClassToInterfaceUser.class b/src/testData/resources/expected/data/classes/ClassToInterfaceUser.class
diff --git a/src/testData/resources/expected/data/classes/EnumToInterfaceUser.class b/src/testData/resources/expected/data/classes/EnumToInterfaceUser.class