From a4212f6bf952971541c4550e20f6bf57a382e19a Mon Sep 17 00:00:00 2001
From: oSumAtrIX <johan.melkonyan1@web.de>
Date: Mon, 23 Oct 2023 00:10:18 +0200
Subject: [PATCH] refactor: Remove deprecated classes and members

BREAKING CHANGE: Some deprecated classes and members are not present anymore.
---
 api/revanced-patcher.api                      | 24 -------------------
 .../app/revanced/patcher/PatcherOptions.kt    | 21 ----------------
 .../app/revanced/patcher/logging/Logger.kt    |  9 -------
 .../patcher/logging/impl/NopLogger.kt         |  6 -----
 4 files changed, 60 deletions(-)
 delete mode 100644 src/main/kotlin/app/revanced/patcher/logging/Logger.kt
 delete mode 100644 src/main/kotlin/app/revanced/patcher/logging/impl/NopLogger.kt

diff --git a/api/revanced-patcher.api b/api/revanced-patcher.api
index 1748398..03b09a4 100644
--- a/api/revanced-patcher.api
+++ b/api/revanced-patcher.api
@@ -65,8 +65,6 @@ public final class app/revanced/patcher/PatcherException$CircularDependencyExcep
 }
 
 public final class app/revanced/patcher/PatcherOptions {
-	public fun <init> (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun <init> (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;Z)V
 	public synthetic fun <init> (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun copy (Ljava/io/File;Ljava/io/File;Ljava/lang/String;Ljava/lang/String;Z)Lapp/revanced/patcher/PatcherOptions;
@@ -273,28 +271,6 @@ public abstract interface annotation class app/revanced/patcher/fingerprint/anno
 	public abstract fun threshold ()I
 }
 
-public abstract interface class app/revanced/patcher/logging/Logger {
-	public abstract fun error (Ljava/lang/String;)V
-	public abstract fun info (Ljava/lang/String;)V
-	public abstract fun trace (Ljava/lang/String;)V
-	public abstract fun warn (Ljava/lang/String;)V
-}
-
-public final class app/revanced/patcher/logging/Logger$DefaultImpls {
-	public static fun error (Lapp/revanced/patcher/logging/Logger;Ljava/lang/String;)V
-	public static fun info (Lapp/revanced/patcher/logging/Logger;Ljava/lang/String;)V
-	public static fun trace (Lapp/revanced/patcher/logging/Logger;Ljava/lang/String;)V
-	public static fun warn (Lapp/revanced/patcher/logging/Logger;Ljava/lang/String;)V
-}
-
-public final class app/revanced/patcher/logging/impl/NopLogger : app/revanced/patcher/logging/Logger {
-	public static final field INSTANCE Lapp/revanced/patcher/logging/impl/NopLogger;
-	public fun error (Ljava/lang/String;)V
-	public fun info (Ljava/lang/String;)V
-	public fun trace (Ljava/lang/String;)V
-	public fun warn (Ljava/lang/String;)V
-}
-
 public abstract class app/revanced/patcher/patch/BytecodePatch : app/revanced/patcher/patch/Patch {
 	public fun <init> ()V
 	public fun <init> (Ljava/util/Set;)V
diff --git a/src/main/kotlin/app/revanced/patcher/PatcherOptions.kt b/src/main/kotlin/app/revanced/patcher/PatcherOptions.kt
index 1bed358..e5eb7b6 100644
--- a/src/main/kotlin/app/revanced/patcher/PatcherOptions.kt
+++ b/src/main/kotlin/app/revanced/patcher/PatcherOptions.kt
@@ -38,27 +38,6 @@ data class PatcherOptions(
         frameworkDirectory = frameworkFileDirectory
     }
 
-    /**
-     * Options for ReVanced [Patcher].
-     * @param inputFile The input file to patch.
-     * @param resourceCachePath The path to the directory to use for caching resources.
-     * @param aaptBinaryPath The path to a custom aapt binary.
-     * @param frameworkFileDirectory The path to the directory to cache the framework file in.
-     */
-    @Deprecated("Use the constructor with the multithreadingDexFileWriter parameter instead")
-    constructor(
-        inputFile: File,
-        resourceCachePath: File = File("revanced-resource-cache"),
-        aaptBinaryPath: String? = null,
-        frameworkFileDirectory: String? = null,
-    ) : this(
-        inputFile,
-        resourceCachePath,
-        aaptBinaryPath,
-        frameworkFileDirectory,
-        false,
-    )
-
     fun recreateResourceCacheDirectory() = resourceCachePath.also {
         if (it.exists()) {
             logger.info("Deleting existing resource cache directory")
diff --git a/src/main/kotlin/app/revanced/patcher/logging/Logger.kt b/src/main/kotlin/app/revanced/patcher/logging/Logger.kt
deleted file mode 100644
index 6b29454..0000000
--- a/src/main/kotlin/app/revanced/patcher/logging/Logger.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package app.revanced.patcher.logging
-
-@Deprecated("This will be removed in a future release")
-interface Logger {
-    fun error(msg: String) {}
-    fun warn(msg: String) {}
-    fun info(msg: String) {}
-    fun trace(msg: String) {}
-}
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patcher/logging/impl/NopLogger.kt b/src/main/kotlin/app/revanced/patcher/logging/impl/NopLogger.kt
deleted file mode 100644
index 1185975..0000000
--- a/src/main/kotlin/app/revanced/patcher/logging/impl/NopLogger.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package app.revanced.patcher.logging.impl
-
-import app.revanced.patcher.logging.Logger
-
-@Deprecated("This will be removed in a future release")
-object NopLogger : Logger
\ No newline at end of file