Fix rewriting static methods when converting type to interface

PaperMC · Sep 26, 2024 · 52d8d55 · 52d8d55
1 parent eb639db
commit 52d8d55
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -56,6 +56,11 @@ allprojects {
 
     repositories {
         mavenCentral()
+        maven("https://repository.ow2.org/nexus/content/repositories/snapshots") {
+            mavenContent {
+                includeGroup("org.ow2.asm")
+            }
+        }
     }
 
     dependencies {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-asm = "9.6"
+asm = "9.8-SNAPSHOT"
 junit = "5.11.1"
 indra = "3.1.3"
 

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