From cd8307f432947f8ac6d4b621134b41f294314bc5 Mon Sep 17 00:00:00 2001
From: Skylot <skylot@gmail.com>
Date: Sun, 5 Jul 2020 14:41:15 +0100
Subject: [PATCH] chore: remove unused d8 from convert plugin

---
 jadx-plugins/jadx-java-convert/build.gradle   |  1 -
 .../input/javaconvert/D8Converter.java        | 53 -------------------
 .../input/javaconvert/JavaConvertLoader.java  |  1 -
 3 files changed, 55 deletions(-)
 delete mode 100644 jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/D8Converter.java

diff --git a/jadx-plugins/jadx-java-convert/build.gradle b/jadx-plugins/jadx-java-convert/build.gradle
index 69b8081dc..a5753b0b9 100644
--- a/jadx-plugins/jadx-java-convert/build.gradle
+++ b/jadx-plugins/jadx-java-convert/build.gradle
@@ -6,6 +6,5 @@ dependencies {
 	api(project(":jadx-plugins:jadx-plugins-api"))
 
 	implementation(project(":jadx-plugins:jadx-dex-input"))
-	implementation('com.android.tools:r8:1.6.84')
 	implementation(files('lib/dx-1.16.jar'))
 }
diff --git a/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/D8Converter.java b/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/D8Converter.java
deleted file mode 100644
index 6ec019c5b..000000000
--- a/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/D8Converter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package jadx.plugins.input.javaconvert;
-
-import java.nio.file.Path;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.android.tools.r8.CompilationFailedException;
-import com.android.tools.r8.CompilationMode;
-import com.android.tools.r8.D8;
-import com.android.tools.r8.D8Command;
-import com.android.tools.r8.Diagnostic;
-import com.android.tools.r8.DiagnosticsHandler;
-import com.android.tools.r8.OutputMode;
-
-public class D8Converter {
-	private static final Logger LOG = LoggerFactory.getLogger(D8Converter.class);
-
-	public static void run(Path path, Path tempDirectory) throws CompilationFailedException {
-		D8Command d8Command = D8Command.builder(new LogHandler())
-				.addProgramFiles(path)
-				.setOutput(tempDirectory, OutputMode.DexIndexed)
-				.setMode(CompilationMode.DEBUG)
-				.setMinApiLevel(30)
-				.setIntermediate(true)
-				.setEnableDesugaring(false)
-				.build();
-		D8.run(d8Command);
-	}
-
-	private static class LogHandler implements DiagnosticsHandler {
-		@Override
-		public void error(Diagnostic diagnostic) {
-			LOG.error("D8 error: {}", format(diagnostic));
-		}
-
-		@Override
-		public void warning(Diagnostic diagnostic) {
-			LOG.warn("D8 warning: {}", format(diagnostic));
-		}
-
-		@Override
-		public void info(Diagnostic diagnostic) {
-			LOG.info("D8 info: {}", format(diagnostic));
-		}
-
-		public static String format(Diagnostic diagnostic) {
-			return diagnostic.getDiagnosticMessage()
-					+ ", origin: " + diagnostic.getOrigin()
-					+ ", position: " + diagnostic.getPosition();
-		}
-	}
-}
diff --git a/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertLoader.java b/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertLoader.java
index 0db886ea7..4d3014832 100644
--- a/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertLoader.java
+++ b/jadx-plugins/jadx-java-convert/src/main/java/jadx/plugins/input/javaconvert/JavaConvertLoader.java
@@ -37,7 +37,6 @@ public class JavaConvertLoader {
 		Path tempDirectory = Files.createTempDirectory("jadx-");
 		result.addTempPath(tempDirectory);
 
-		// D8Converter.run(path, tempDirectory);
 		DxConverter.run(path, tempDirectory);
 
 		LOG.debug("Converted to dex: {}", path.toAbsolutePath());