feat: Remove deprecated functions

BREAKING CHANGE: Some functions have been removed.

src/commonMain/kotlin/app/revanced/library/ApkSigner.kt

@@ -1,9 +1,6 @@
 package app.revanced.library
 
 import com.android.apksig.ApkSigner.SignerConfig
-import com.android.tools.build.apkzlib.sign.SigningExtension
-import com.android.tools.build.apkzlib.sign.SigningOptions
-import com.android.tools.build.apkzlib.zip.ZFile
 import org.bouncycastle.asn1.x500.X500Name
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo
 import org.bouncycastle.cert.X509v3CertificateBuilder
@@ -13,7 +10,6 @@ import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder
 import java.io.File
 import java.io.IOException
 import java.io.InputStream
-import java.io.OutputStream
 import java.math.BigInteger
 import java.security.*
 import java.security.cert.X509Certificate
@@ -197,105 +193,6 @@ object ApkSigner {
         ),
     )
 
-    /**
-     * Read a [PrivateKeyCertificatePair] from a keystore entry.
-     *
-     * @param keyStore The keystore to read the entry from.
-     * @param keyStoreEntryAlias The alias of the key store entry to read.
-     * @param keyStoreEntryPassword The password for recovering the signing key.
-     *
-     * @return The read [PrivateKeyCertificatePair].
-     *
-     * @throws IllegalArgumentException If the keystore does not contain the given alias or the password is invalid.
-     */
-    @Deprecated("This method will be removed in the future.")
-    fun readKeyCertificatePair(
-        keyStore: KeyStore,
-        keyStoreEntryAlias: String,
-        keyStoreEntryPassword: String,
-    ) = readPrivateKeyCertificatePair(keyStore, keyStoreEntryAlias, keyStoreEntryPassword)
-
-    /**
-     * Create a new keystore with a new keypair and saves it to the given [keyStoreOutputStream].
-     *
-     * @param keyStoreOutputStream The stream to write the keystore to.
-     * @param keyStorePassword The password for the keystore.
-     * @param entries The entries to add to the keystore.
-     */
-    @Deprecated("This method will be removed in the future.")
-    fun newKeyStore(
-        keyStoreOutputStream: OutputStream,
-        keyStorePassword: String?,
-        entries: Set<KeyStoreEntry>,
-    ) = newKeyStore(entries).store(
-        keyStoreOutputStream,
-        keyStorePassword?.toCharArray(),
-    )
-
-    /**
-     * Create a new [Signer].
-     *
-     * @param privateKeyCertificatePair The private key and certificate pair to use for signing.
-     *
-     * @return The new [Signer].
-     *
-     * @see PrivateKeyCertificatePair
-     * @see Signer
-     */
-    @Deprecated("This method will be removed in the future.")
-    fun newApkSigner(privateKeyCertificatePair: PrivateKeyCertificatePair) =
-        Signer(
-            SigningExtension(
-                SigningOptions.builder()
-                    .setMinSdkVersion(21) // TODO: Extracting from the target APK would be ideal.
-                    .setV1SigningEnabled(true)
-                    .setV2SigningEnabled(true)
-                    .setCertificates(privateKeyCertificatePair.certificate)
-                    .setKey(privateKeyCertificatePair.privateKey)
-                    .build(),
-            ),
-        )
-
-    /**
-     * Create a new [Signer].
-     *
-     * @param signer The name of the signer.
-     * @param keyStore The keystore to use for signing.
-     * @param keyStoreEntryAlias The alias of the key store entry to use for signing.
-     * @param keyStoreEntryPassword The password for recovering the signing key.
-     *
-     * @return The new [Signer].
-     *
-     * @see KeyStore
-     * @see Signer
-     */
-    @Deprecated("This method will be removed in the future.")
-    fun newApkSigner(
-        signer: String,
-        keyStore: KeyStore,
-        keyStoreEntryAlias: String,
-        keyStoreEntryPassword: String,
-    ) = newApkSigner(signer, readKeyCertificatePair(keyStore, keyStoreEntryAlias, keyStoreEntryPassword))
-
-    /**
-     * Create a new [Signer].
-     *
-     * @param keyStore The keystore to use for signing.
-     * @param keyStoreEntryAlias The alias of the key store entry to use for signing.
-     * @param keyStoreEntryPassword The password for recovering the signing key.
-     *
-     * @return The new [Signer].
-     *
-     * @see KeyStore
-     * @see Signer
-     */
-    @Deprecated("This method will be removed in the future.")
-    fun newApkSigner(
-        keyStore: KeyStore,
-        keyStoreEntryAlias: String,
-        keyStoreEntryPassword: String,
-    ) = newApkSigner("ReVanced", readKeyCertificatePair(keyStore, keyStoreEntryAlias, keyStoreEntryPassword))
-
     /**
      * An entry in a keystore.
      *
@@ -322,48 +219,11 @@ object ApkSigner {
         val certificate: X509Certificate,
     )
 
-    class Signer {
-        private val signerBuilder: com.android.apksig.ApkSigner.Builder?
-        private val signingExtension: SigningExtension?
-
-        internal constructor(signerBuilder: com.android.apksig.ApkSigner.Builder) {
-            this.signerBuilder = signerBuilder
-            signingExtension = null
-        }
-
+    class Signer internal constructor(private val signerBuilder: com.android.apksig.ApkSigner.Builder) {
         fun signApk(inputApkFile: File, outputApkFile: File) {
             logger.info("Signing APK")
 
-            signerBuilder?.setInputApk(inputApkFile)?.setOutputApk(outputApkFile)?.build()?.sign()
-        }
-
-        @Deprecated("This constructor will be removed in the future.")
-        internal constructor(signingExtension: SigningExtension) {
-            signerBuilder = null
-            this.signingExtension = signingExtension
-        }
-
-        /**
-         * Sign an APK file.
-         *
-         * @param apkFile The APK file to sign.
-         */
-        @Deprecated("This method will be removed in the future.")
-        fun signApk(apkFile: File) = ZFile.openReadWrite(apkFile).use {
-            @Suppress("DEPRECATION")
-            signApk(it)
-        }
-
-        /**
-         * Sign an APK file.
-         *
-         * @param apkZFile The APK [ZFile] to sign.
-         */
-        @Deprecated("This method will be removed in the future.")
-        fun signApk(apkZFile: ZFile) {
-            logger.info("Signing ${apkZFile.file.name}")
-
-            signingExtension?.register(apkZFile)
+            signerBuilder.setInputApk(inputApkFile)?.setOutputApk(outputApkFile)?.build()?.sign()
         }
     }
 }

src/commonMain/kotlin/app/revanced/library/ApkUtils.kt

@@ -103,8 +103,7 @@ object ApkUtils {
      *
      * @return The newly created private key and certificate pair.
      */
-    @Deprecated("This method will be removed in the future.")
-    fun newPrivateKeyCertificatePair(
+    private fun newPrivateKeyCertificatePair(
         privateKeyCertificatePairDetails: PrivateKeyCertificatePairDetails,
         keyStoreDetails: KeyStoreDetails,
     ) = newPrivateKeyCertificatePair(
@@ -132,8 +131,7 @@ object ApkUtils {
      *
      * @return The private key and certificate pair.
      */
-    @Deprecated("This method will be removed in the future.")
-    fun readPrivateKeyCertificatePairFromKeyStore(
+    private fun readPrivateKeyCertificatePairFromKeyStore(
         keyStoreDetails: KeyStoreDetails,
     ) = ApkSigner.readPrivateKeyCertificatePair(
         ApkSigner.readKeyStore(
@@ -168,91 +166,6 @@ object ApkUtils {
         },
     ).signApk(inputApkFile, outputApkFile)
 
-    @Deprecated("This method will be removed in the future.")
-    private fun readOrNewPrivateKeyCertificatePair(
-        signingOptions: SigningOptions,
-    ): ApkSigner.PrivateKeyCertificatePair {
-        val privateKeyCertificatePairDetails = PrivateKeyCertificatePairDetails(
-            signingOptions.alias,
-            PrivateKeyCertificatePairDetails().validUntil,
-        )
-        val keyStoreDetails = KeyStoreDetails(
-            signingOptions.keyStore,
-            signingOptions.keyStorePassword,
-            signingOptions.alias,
-            signingOptions.password,
-        )
-
-        return if (keyStoreDetails.keyStore.exists()) {
-            readPrivateKeyCertificatePairFromKeyStore(keyStoreDetails)
-        } else {
-            newPrivateKeyCertificatePair(privateKeyCertificatePairDetails, keyStoreDetails)
-        }
-    }
-
-    /**
-     * Signs [inputApkFile] with the given options and saves the signed apk to [outputApkFile].
-     *
-     * @param inputApkFile The apk file to sign.
-     * @param outputApkFile The file to save the signed apk to.
-     * @param signer The name of the signer.
-     * @param privateKeyCertificatePair The private key and certificate pair to use for signing.
-     */
-    @Deprecated("This method will be removed in the future.")
-    fun sign(
-        inputApkFile: File,
-        outputApkFile: File,
-        signer: String,
-        privateKeyCertificatePair: ApkSigner.PrivateKeyCertificatePair,
-    ) = ApkSigner.newApkSigner(
-        signer,
-        privateKeyCertificatePair,
-    ).signApk(inputApkFile, outputApkFile)
-
-    /**
-     * Signs the apk file with the given options.
-     *
-     * @param signingOptions The options to use for signing.
-     */
-    @Deprecated("This method will be removed in the future.")
-    fun File.sign(signingOptions: SigningOptions) = ApkSigner.newApkSigner(
-        signingOptions.signer,
-        readOrNewPrivateKeyCertificatePair(signingOptions),
-    ).signApk(this)
-
-    /**
-     * Signs [inputApkFile] with the given options and saves the signed apk to [outputApkFile].
-     *
-     * @param inputApkFile The apk file to sign.
-     * @param outputApkFile The file to save the signed apk to.
-     * @param signingOptions The options to use for signing.
-     */
-    @Deprecated("This method will be removed in the future.")
-    fun sign(inputApkFile: File, outputApkFile: File, signingOptions: SigningOptions) = sign(
-        inputApkFile,
-        outputApkFile,
-        signingOptions.signer,
-        readOrNewPrivateKeyCertificatePair(signingOptions),
-    )
-
-    /**
-     * Options for signing an apk.
-     *
-     * @param keyStore The keystore to use for signing.
-     * @param keyStorePassword The password for the keystore.
-     * @param alias The alias of the key store entry to use for signing.
-     * @param password The password for recovering the signing key.
-     * @param signer The name of the signer.
-     */
-    @Deprecated("This class will be removed in the future.")
-    class SigningOptions(
-        val keyStore: File,
-        val keyStorePassword: String?,
-        val alias: String = "ReVanced Key",
-        val password: String = "",
-        val signer: String = "ReVanced",
-    )
-
     /**
      * Details for a keystore.
      *

src/commonMain/kotlin/app/revanced/library/Commands.kt

@@ -1,43 +0,0 @@
-@file:Suppress("DeprecatedCallableAddReplaceWith")
-
-package app.revanced.library
-
-import app.revanced.library.installation.command.AdbShellCommandRunner
-import se.vidstige.jadb.JadbDevice
-import se.vidstige.jadb.ShellProcessBuilder
-import java.io.File
-
-@Deprecated("Do not use this anymore. Instead use AdbCommandRunner.")
-internal fun JadbDevice.buildCommand(
-    command: String,
-    su: Boolean = true,
-): ShellProcessBuilder {
-    if (su) return shellProcessBuilder("su -c \'$command\'")
-
-    val args = command.split(" ") as ArrayList<String>
-    val cmd = args.removeFirst()
-
-    return shellProcessBuilder(cmd, *args.toTypedArray())
-}
-
-@Suppress("DEPRECATION")
-@Deprecated("Use AdbShellCommandRunner instead.")
-internal fun JadbDevice.run(
-    command: String,
-    su: Boolean = true,
-) = buildCommand(command, su).start()
-
-@Deprecated("Use AdbShellCommandRunner instead.")
-internal fun JadbDevice.hasSu() = AdbShellCommandRunner(this).hasRootPermission()
-
-@Deprecated("Use AdbShellCommandRunner instead.")
-internal fun JadbDevice.push(
-    file: File,
-    targetFilePath: String,
-) = AdbShellCommandRunner(this).move(file, targetFilePath)
-
-@Deprecated("Use AdbShellCommandRunner instead.")
-internal fun JadbDevice.createFile(
-    targetFile: String,
-    content: String,
-) = AdbShellCommandRunner(this).write(content.byteInputStream(), targetFile)

src/commonMain/kotlin/app/revanced/library/Options.kt

@@ -4,17 +4,15 @@ package app.revanced.library
 
 import app.revanced.patcher.patch.OptionException
 import app.revanced.patcher.patch.Patch
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import java.io.File
 import java.util.logging.Logger
 
-private val logger = Logger.getLogger("Options")
-
 typealias PatchName = String
 typealias OptionKey = String
 typealias OptionValue = Any?
 typealias PatchesOptions = Map<PatchName, Map<OptionKey, OptionValue>>
 
+private val logger = Logger.getLogger("Options")
+
 /**
  * Set the options for a set of patches that have a name.
  *
@@ -31,107 +29,3 @@ fun Set<Patch<*>>.setOptions(options: PatchesOptions) = filter { it.name != null
         }
     }
 }
-
-@Suppress("unused")
-@Deprecated("Functions have been moved to top level.")
-object Options {
-    private val logger = Logger.getLogger(Options::class.java.name)
-
-    private val mapper = jacksonObjectMapper()
-
-    /**
-     * Serializes the options for a set of patches.
-     *
-     * @param patches The set of patches to serialize.
-     * @param prettyPrint Whether to pretty print the JSON.
-     * @return The JSON string containing the options.
-     */
-    @Deprecated("Functions have been moved to the Serialization class.")
-    fun serialize(
-        patches: Set<app.revanced.patcher.patch.Patch<*>>,
-        prettyPrint: Boolean = false,
-    ): String =
-        patches
-            .filter { it.options.any() }
-            .map { patch ->
-                Patch(
-                    patch.name!!,
-                    patch.options.values.map { option ->
-                        val optionValue =
-                            try {
-                                option.value
-                            } catch (e: OptionException) {
-                                logger.warning("Using default option value for the \"${patch.name}\" patch: ${e.message}")
-                                option.default
-                            }
-
-                        Patch.Option(option.key, optionValue)
-                    },
-                )
-            }
-            // See https://github.com/revanced/revanced-patches/pull/2434/commits/60e550550b7641705e81aa72acfc4faaebb225e7.
-            .distinctBy { it.patchName }
-            .let {
-                if (prettyPrint) {
-                    mapper.writerWithDefaultPrettyPrinter().writeValueAsString(it)
-                } else {
-                    mapper.writeValueAsString(it)
-                }
-            }
-
-    /**
-     * Deserializes the options to a set of patches.
-     *
-     * @param json The JSON string containing the options.
-     * @return A set of [Patch]s.
-     * @see Patch
-     */
-    @Deprecated("Functions have been moved to the Serialization class.")
-    fun deserialize(json: String): Array<Patch> = mapper.readValue(json, Array<Patch>::class.java)
-
-    /**
-     * Sets the options for a set of patches.
-     *
-     * @param json The JSON string containing the options.
-     */
-    @Deprecated("Function has been moved to top level.")
-    fun Set<app.revanced.patcher.patch.Patch<*>>.setOptions(json: String) {
-        filter { it.options.any() }.let { patches ->
-            if (patches.isEmpty()) return
-
-            val jsonPatches = deserialize(json).associate {
-                it.patchName to it.options.associate { option -> option.key to option.value }
-            }
-
-            setOptions(jsonPatches)
-        }
-    }
-
-    /**
-     * Sets the options for a set of patches.
-     *
-     * @param file The file containing the JSON string containing the options.
-     * @see setOptions
-     */
-    @Deprecated("Function has been moved to top level.")
-    fun Set<app.revanced.patcher.patch.Patch<*>>.setOptions(file: File) = setOptions(file.readText())
-
-    /**
-     * Data class for a patch and its [Option]s.
-     *
-     * @property patchName The name of the patch.
-     * @property options The [Option]s for the patch.
-     */
-    class Patch internal constructor(
-        val patchName: String,
-        val options: List<Option>,
-    ) {
-        /**
-         * Data class for patch option.
-         *
-         * @property key The name of the option.
-         * @property value The value of the option.
-         */
-        class Option internal constructor(val key: String, val value: Any?)
-    }
-}

src/commonMain/kotlin/app/revanced/library/PatchUtils.kt

@@ -1,124 +0,0 @@
-package app.revanced.library
-
-import app.revanced.patcher.patch.Option
-import app.revanced.patcher.patch.Package
-import app.revanced.patcher.patch.Patch
-import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import java.io.InputStream
-import java.io.OutputStream
-import kotlin.reflect.KType
-
-@Deprecated("Functions have been moved to top level.")
-object PatchUtils {
-    @Deprecated(
-        "Function has been moved to top level.",
-        ReplaceWith("patches.mostCommonCompatibleVersions(packageNames, countUnusedPatches)"),
-    )
-    fun getMostCommonCompatibleVersions(
-        patches: Set<Patch<*>>,
-        packageNames: Set<String>? = null,
-        countUnusedPatches: Boolean = false,
-    ): PackageNameMap = patches.mostCommonCompatibleVersions(packageNames, countUnusedPatches)
-
-    @Deprecated("Functions have been moved to the Serialization class.")
-    object Json {
-        private val mapper = jacksonObjectMapper()
-
-        /**
-         * Serializes a set of [Patch]es to a JSON string and writes it to an output stream.
-         *
-         * @param patches The set of [Patch]es to serialize.
-         * @param transform A function to transform the [Patch]es to [JsonPatch]es.
-         * @param prettyPrint Whether to pretty print the JSON.
-         * @param outputStream The output stream to write the JSON to.
-         */
-        @Deprecated("Functions have been moved to the Serialization class.")
-        fun serialize(
-            patches: Set<Patch<*>>,
-            transform: (Patch<*>) -> JsonPatch = { patch -> FullJsonPatch.fromPatch(patch) },
-            prettyPrint: Boolean = false,
-            outputStream: OutputStream,
-        ) {
-            patches.map(transform).let { transformed ->
-                if (prettyPrint) {
-                    mapper.writerWithDefaultPrettyPrinter().writeValue(outputStream, transformed)
-                } else {
-                    mapper.writeValue(outputStream, transformed)
-                }
-            }
-        }
-
-        /**
-         * Deserializes a JSON string to a set of [FullJsonPatch]es from an input stream.
-         *
-         * @param inputStream The input stream to read the JSON from.
-         * @param jsonPatchElementClass The class of the [JsonPatch]es to deserialize.
-         * @return A set of [JsonPatch]es.
-         * @see FullJsonPatch
-         */
-        @Deprecated("This function will be removed in the future.")
-        fun <T : JsonPatch> deserialize(
-            inputStream: InputStream,
-            jsonPatchElementClass: Class<T>,
-        ): Set<T> =
-            mapper.readValue(
-                inputStream,
-                mapper.typeFactory.constructCollectionType(Set::class.java, jsonPatchElementClass),
-            )
-
-        interface JsonPatch
-
-        /**
-         * A JSON representation of a [Patch].
-         * @see Patch
-         */
-        class FullJsonPatch internal constructor(
-            val name: String?,
-            val description: String?,
-            val compatiblePackages: Set<Package>?,
-            // Cannot serialize dependencies, because they are references to other patches and patch names are nullable.
-            // val dependencies: Set<String>,
-            val use: Boolean,
-            val options: Map<String, FullJsonPatchOption<*>>,
-        ) : JsonPatch {
-            internal companion object {
-                internal fun fromPatch(patch: Patch<*>) =
-                    FullJsonPatch(
-                        patch.name,
-                        patch.description,
-                        patch.compatiblePackages,
-                        // buildSet { patch.dependencies.forEach { add(it.name) } },
-                        patch.use,
-                        patch.options.mapValues { FullJsonPatchOption.fromPatchOption(it.value) },
-                    )
-            }
-
-            /**
-             * A JSON representation of a [Option].
-             * @see Option
-             */
-            class FullJsonPatchOption<T> internal constructor(
-                val key: String,
-                val default: T?,
-                val values: Map<String, T?>?,
-                val title: String?,
-                val description: String?,
-                val required: Boolean,
-                val type: KType,
-            ) {
-                internal companion object {
-                    internal fun fromPatchOption(option: Option<*>) =
-                        FullJsonPatchOption(
-                            option.key,
-                            option.default,
-                            option.values,
-                            option.title,
-                            option.description,
-                            option.required,
-                            option.type,
-                        )
-                }
-            }
-        }
-    }
-}

src/commonMain/kotlin/app/revanced/library/adb/AdbManager.kt

@@ -1,144 +0,0 @@
-@file:Suppress("DEPRECATION")
-
-package app.revanced.library.adb
-
-import app.revanced.library.adb.AdbManager.Apk
-import app.revanced.library.installation.installer.AdbInstaller
-import app.revanced.library.installation.installer.AdbRootInstaller
-import app.revanced.library.installation.installer.Constants.PLACEHOLDER
-import app.revanced.library.installation.installer.Installer
-import app.revanced.library.run
-import se.vidstige.jadb.JadbDevice
-import java.io.File
-
-/**
- * [AdbManager] to install and uninstall [Apk] files.
- *
- * @param deviceSerial The serial of the device. If null, the first connected device will be used.
- */
-@Deprecated("Use an implementation of Installer instead.")
-@Suppress("unused")
-sealed class AdbManager private constructor(
-    @Suppress("UNUSED_PARAMETER") deviceSerial: String?,
-) {
-    protected abstract val installer: Installer<*, *>
-
-    /**
-     * Installs the [Apk] file.
-     *
-     * @param apk The [Apk] file.
-     */
-    @Suppress("DeprecatedCallableAddReplaceWith")
-    @Deprecated("Use Installer.install instead.")
-    open fun install(apk: Apk) = suspend {
-        installer.install(Installer.Apk(apk.file, apk.packageName))
-    }
-
-    /**
-     * Uninstalls the package.
-     *
-     * @param packageName The package name.
-     */
-    @Suppress("DeprecatedCallableAddReplaceWith")
-    @Deprecated("Use Installer.uninstall instead.")
-    open fun uninstall(packageName: String) = suspend {
-        installer.uninstall(packageName)
-    }
-
-    @Deprecated("Use Installer instead.")
-    companion object {
-        /**
-         * Gets an [AdbManager] for the supplied device serial.
-         *
-         * @param deviceSerial The device serial. If null, the first connected device will be used.
-         * @param root Whether to use root or not.
-         * @return The [AdbManager].
-         * @throws DeviceNotFoundException If the device can not be found.
-         */
-        @Suppress("DeprecatedCallableAddReplaceWith")
-        @Deprecated("This is deprecated.")
-        fun getAdbManager(
-            deviceSerial: String? = null,
-            root: Boolean = false,
-        ): AdbManager = if (root) RootAdbManager(deviceSerial) else UserAdbManager(deviceSerial)
-    }
-
-    /**
-     * Adb manager for rooted devices.
-     *
-     * @param deviceSerial The device serial. If null, the first connected device will be used.
-     */
-    @Deprecated("Use AdbRootInstaller instead.", ReplaceWith("AdbRootInstaller(deviceSerial)"))
-    class RootAdbManager internal constructor(deviceSerial: String?) : AdbManager(deviceSerial) {
-        override val installer = AdbRootInstaller(deviceSerial)
-
-        @Suppress("DeprecatedCallableAddReplaceWith")
-        @Deprecated("Use AdbRootInstaller.install instead.")
-        override fun install(apk: Apk) = suspend {
-            installer.install(Installer.Apk(apk.file, apk.packageName))
-        }
-
-        @Suppress("DeprecatedCallableAddReplaceWith")
-        @Deprecated("Use AdbRootInstaller.uninstall instead.")
-        override fun uninstall(packageName: String) = suspend {
-            installer.uninstall(packageName)
-        }
-
-        @Deprecated("This is deprecated.")
-        companion object Utils {
-            private fun JadbDevice.run(
-                command: String,
-                with: String,
-            ) = run(command.applyReplacement(with))
-
-            private fun String.applyReplacement(with: String) = replace(PLACEHOLDER, with)
-        }
-    }
-
-    /**
-     * Adb manager for non-rooted devices.
-     *
-     * @param deviceSerial The device serial. If null, the first connected device will be used.
-     */
-    @Deprecated("Use AdbInstaller instead.")
-    class UserAdbManager internal constructor(deviceSerial: String?) : AdbManager(deviceSerial) {
-        override val installer = AdbInstaller(deviceSerial)
-
-        @Suppress("DeprecatedCallableAddReplaceWith")
-        @Deprecated("Use AdbInstaller.install instead.")
-        override fun install(apk: Apk) = suspend {
-            installer.install(Installer.Apk(apk.file, apk.packageName))
-        }
-
-        @Suppress("DeprecatedCallableAddReplaceWith")
-        @Deprecated("Use AdbInstaller.uninstall instead.")
-        override fun uninstall(packageName: String) = suspend {
-            installer.uninstall(packageName)
-        }
-    }
-
-    /**
-     * Apk file for [AdbManager].
-     *
-     * @param file The [Apk] file.
-     * @param packageName The package name of the [Apk] file.
-     */
-    @Deprecated("Use Installer.Apk instead.")
-    class Apk(val file: File, val packageName: String? = null)
-
-    @Deprecated("Use AdbCommandRunner.DeviceNotFoundException instead.")
-    class DeviceNotFoundException internal constructor(deviceSerial: String? = null) :
-        Exception(
-            deviceSerial?.let {
-                "The device with the ADB device serial \"$deviceSerial\" can not be found"
-            } ?: "No ADB device found",
-        )
-
-    @Deprecated("Use RootInstaller.FailedToFindInstalledPackageException instead.")
-    class FailedToFindInstalledPackageException internal constructor(packageName: String) :
-        Exception("Failed to find installed package \"$packageName\" because no activity was found")
-
-    @Deprecated("Use RootInstaller.PackageNameRequiredException instead.")
-    class PackageNameRequiredException internal constructor() :
-        Exception("Package name is required")
-}