Fix deprecated API usage in RemappingClassBuilder
#KT-25058 Fixed
This commit is contained in:
@@ -27,6 +27,7 @@ import org.jetbrains.org.objectweb.asm.ClassVisitor;
|
|||||||
import org.jetbrains.org.objectweb.asm.FieldVisitor;
|
import org.jetbrains.org.objectweb.asm.FieldVisitor;
|
||||||
import org.jetbrains.org.objectweb.asm.MethodVisitor;
|
import org.jetbrains.org.objectweb.asm.MethodVisitor;
|
||||||
import org.jetbrains.org.objectweb.asm.commons.*;
|
import org.jetbrains.org.objectweb.asm.commons.*;
|
||||||
|
import org.jetbrains.org.objectweb.asm.commons.FieldRemapper;
|
||||||
|
|
||||||
public class RemappingClassBuilder extends DelegatingClassBuilder {
|
public class RemappingClassBuilder extends DelegatingClassBuilder {
|
||||||
private final ClassBuilder builder;
|
private final ClassBuilder builder;
|
||||||
@@ -66,9 +67,8 @@ public class RemappingClassBuilder extends DelegatingClassBuilder {
|
|||||||
@Nullable String signature,
|
@Nullable String signature,
|
||||||
@Nullable Object value
|
@Nullable Object value
|
||||||
) {
|
) {
|
||||||
return new RemappingFieldAdapter(
|
return new FieldRemapper(
|
||||||
builder.newField(origin, access, name, remapper.mapDesc(desc), remapper.mapSignature(signature, true), value),
|
builder.newField(origin, access, name, remapper.mapDesc(desc), remapper.mapSignature(signature, true), value), remapper
|
||||||
remapper
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -82,8 +82,7 @@ public class RemappingClassBuilder extends DelegatingClassBuilder {
|
|||||||
@Nullable String signature,
|
@Nullable String signature,
|
||||||
@Nullable String[] exceptions
|
@Nullable String[] exceptions
|
||||||
) {
|
) {
|
||||||
return new RemappingMethodAdapter(
|
return new MethodRemapper(
|
||||||
access, desc,
|
|
||||||
builder.newMethod(origin, access, name, remapper.mapMethodDesc(desc), remapper.mapSignature(signature, false), exceptions),
|
builder.newMethod(origin, access, name, remapper.mapMethodDesc(desc), remapper.mapSignature(signature, false), exceptions),
|
||||||
remapper
|
remapper
|
||||||
);
|
);
|
||||||
@@ -92,12 +91,12 @@ public class RemappingClassBuilder extends DelegatingClassBuilder {
|
|||||||
@Override
|
@Override
|
||||||
@NotNull
|
@NotNull
|
||||||
public AnnotationVisitor newAnnotation(@NotNull String desc, boolean visible) {
|
public AnnotationVisitor newAnnotation(@NotNull String desc, boolean visible) {
|
||||||
return new RemappingAnnotationAdapter(builder.newAnnotation(remapper.mapDesc(desc), visible), remapper);
|
return new AnnotationRemapper(builder.newAnnotation(remapper.mapDesc(desc), visible), remapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@NotNull
|
@NotNull
|
||||||
public ClassVisitor getVisitor() {
|
public ClassVisitor getVisitor() {
|
||||||
return new RemappingClassAdapter(builder.getVisitor(), remapper);
|
return new ClassRemapper(builder.getVisitor(), remapper);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user