From a8e5eddbf121f75173f580d30c1f69e9e1f0a568 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Tue, 12 Dec 2017 20:59:30 -0800
Subject: RemappingClassAdapter is deprecated, use ClassRemapper instead

Change-Id: I232828d44447ee66019ff0fedb5ebc18b2e7aee9
---
 .../jarjar/dependencies/DependencyFinderClassVisitor.java             | 4 ++--
 .../tonicsystems/jarjar/transform/asm/RemappingClassTransformer.java  | 4 ++--
 .../tonicsystems/jarjar/transform/jar/ClassClosureJarProcessor.java   | 4 ++--
 .../src/test/java/com/tonicsystems/jarjar/GenericsTest.java           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'third_party/java')

diff --git a/third_party/java/jarjar/jarjar-core/src/main/java/com/tonicsystems/jarjar/dependencies/DependencyFinderClassVisitor.java b/third_party/java/jarjar/jarjar-core/src/main/java/com/tonicsystems/jarjar/dependencies/DependencyFinderClassVisitor.java
index 968a4c5a4a..9da0fbad85 100644
--- a/third_party/java/jarjar/jarjar-core/src/main/java/com/tonicsystems/jarjar/dependencies/DependencyFinderClassVisitor.java
+++ b/third_party/java/jarjar/jarjar-core/src/main/java/com/tonicsystems/jarjar/dependencies/DependencyFinderClassVisitor.java
@@ -19,9 +19,9 @@ import com.tonicsystems.jarjar.util.RuntimeIOException;
 import java.io.IOException;
 import java.util.Map;
 import org.objectweb.asm.commons.Remapper;
-import org.objectweb.asm.commons.RemappingClassAdapter;
+import org.objectweb.asm.commons.ClassRemapper;
 
-class DependencyFinderClassVisitor extends RemappingClassAdapter {
+class DependencyFinderClassVisitor extends ClassRemapper {
 
     public DependencyFinderClassVisitor(Map<String, String> classToArchiveMap, String archiveName, DependencyHandler handler) throws IOException {
         super(null, new DependencyFinderRemapper(classToArchiveMap, archiveName, handler));
diff --git a/third_party/java/jarjar/jarjar-core/src/main/java/com/tonicsystems/jarjar/transform/asm/RemappingClassTransformer.java b/third_party/java/jarjar/jarjar-core/src/main/java/com/tonicsystems/jarjar/transform/asm/RemappingClassTransformer.java
index a30341c6d0..84aed880ba 100644
--- a/third_party/java/jarjar/jarjar-core/src/main/java/com/tonicsystems/jarjar/transform/asm/RemappingClassTransformer.java
+++ b/third_party/java/jarjar/jarjar-core/src/main/java/com/tonicsystems/jarjar/transform/asm/RemappingClassTransformer.java
@@ -8,7 +8,7 @@ package com.tonicsystems.jarjar.transform.asm;
 import javax.annotation.Nonnull;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.commons.Remapper;
-import org.objectweb.asm.commons.RemappingClassAdapter;
+import org.objectweb.asm.commons.ClassRemapper;
 
 /**
  *
@@ -24,7 +24,7 @@ public class RemappingClassTransformer implements ClassTransformer {
 
     @Override
     public ClassVisitor transform(ClassVisitor v) {
-        return new RemappingClassAdapter(v, remapper);
+        return new ClassRemapper(v, remapper);
     }
 
 }
diff --git a/third_party/java/jarjar/jarjar-core/src/main/java/com/tonicsystems/jarjar/transform/jar/ClassClosureJarProcessor.java b/third_party/java/jarjar/jarjar-core/src/main/java/com/tonicsystems/jarjar/transform/jar/ClassClosureJarProcessor.java
index c5f9318e43..3a44d3868a 100644
--- a/third_party/java/jarjar/jarjar-core/src/main/java/com/tonicsystems/jarjar/transform/jar/ClassClosureJarProcessor.java
+++ b/third_party/java/jarjar/jarjar-core/src/main/java/com/tonicsystems/jarjar/transform/jar/ClassClosureJarProcessor.java
@@ -32,7 +32,7 @@ import java.util.Set;
 import javax.annotation.Nonnull;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.commons.Remapper;
-import org.objectweb.asm.commons.RemappingClassAdapter;
+import org.objectweb.asm.commons.ClassRemapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -106,7 +106,7 @@ public class ClassClosureJarProcessor extends AbstractFilterJarProcessor {
                         roots.add(name);
                 DependencyCollector collector = new DependencyCollector();
                 dependencies.put(name, collector.dependencies);
-                new ClassReader(new ByteArrayInputStream(struct.data)).accept(new RemappingClassAdapter(null, collector), ClassReader.EXPAND_FRAMES);
+                new ClassReader(new ByteArrayInputStream(struct.data)).accept(new ClassRemapper(null, collector), ClassReader.EXPAND_FRAMES);
                 collector.dependencies.remove(name);
             }
         } catch (Exception e) {
diff --git a/third_party/java/jarjar/jarjar-core/src/test/java/com/tonicsystems/jarjar/GenericsTest.java b/third_party/java/jarjar/jarjar-core/src/test/java/com/tonicsystems/jarjar/GenericsTest.java
index a7079471a8..6895f51978 100644
--- a/third_party/java/jarjar/jarjar-core/src/test/java/com/tonicsystems/jarjar/GenericsTest.java
+++ b/third_party/java/jarjar/jarjar-core/src/test/java/com/tonicsystems/jarjar/GenericsTest.java
@@ -19,14 +19,14 @@ import com.tonicsystems.jarjar.transform.asm.PackageRemapper;
 import com.tonicsystems.jarjar.transform.config.ClassRename;
 import org.junit.Test;
 import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.commons.RemappingClassAdapter;
+import org.objectweb.asm.commons.ClassRemapper;
 
 public class GenericsTest {
 
     @Test
     public void testTransform() throws Exception {
         ClassRename rule = new ClassRename("java.lang.String", "com.tonicsystems.String");
-        RemappingClassAdapter t = new RemappingClassAdapter(null, new PackageRemapper(rule));
+        ClassRemapper t = new ClassRemapper(null, new PackageRemapper(rule));
         ClassReader reader = new ClassReader(getClass().getResourceAsStream("/Generics.class"));
         reader.accept(t, 0);
     }
-- 
cgit v1.2.3