diff --git a/build.gradle.kts b/build.gradle.kts index 8e661a7..ec2f544 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -37,7 +37,7 @@ tasks { shadowJar { manifest { - attributes("Main-Class" to "app.revanced.cli.main.MainKt") + attributes("Main-Class" to "app.revanced.cli.command.MainCommandKt") } minimize { exclude(dependency("org.jetbrains.kotlin:.*")) diff --git a/src/main/kotlin/app/revanced/cli/command/Main.kt b/src/main/kotlin/app/revanced/cli/command/MainCommand.kt similarity index 84% rename from src/main/kotlin/app/revanced/cli/command/Main.kt rename to src/main/kotlin/app/revanced/cli/command/MainCommand.kt index e853138..49ae32d 100644 --- a/src/main/kotlin/app/revanced/cli/command/Main.kt +++ b/src/main/kotlin/app/revanced/cli/command/MainCommand.kt @@ -8,7 +8,7 @@ import picocli.CommandLine.IVersionProvider import java.util.* fun main(args: Array) { - CommandLine(Main).execute(*args) + CommandLine(MainCommand).execute(*args) } internal typealias PatchList = List @@ -18,7 +18,7 @@ internal val logger = DefaultCliLogger() object CLIVersionProvider : IVersionProvider { override fun getVersion(): Array { Properties().apply { - load(Main::class.java.getResourceAsStream("/app/revanced/cli/version.properties")) + load(MainCommand::class.java.getResourceAsStream("/app/revanced/cli/version.properties")) }.let { return arrayOf("ReVanced CLI v${it.getProperty("version")}") } @@ -37,4 +37,4 @@ object CLIVersionProvider : IVersionProvider { OptionsCommand::class, ] ) -internal object Main \ No newline at end of file +internal object MainCommand \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/cli/logging/impl/DefaultCliLogger.kt b/src/main/kotlin/app/revanced/cli/logging/impl/DefaultCliLogger.kt index d3b22bd..db9306a 100644 --- a/src/main/kotlin/app/revanced/cli/logging/impl/DefaultCliLogger.kt +++ b/src/main/kotlin/app/revanced/cli/logging/impl/DefaultCliLogger.kt @@ -1,12 +1,12 @@ package app.revanced.cli.logging.impl -import app.revanced.cli.command.Main +import app.revanced.cli.command.MainCommand import app.revanced.cli.logging.CliLogger import java.util.logging.Logger import java.util.logging.SimpleFormatter internal class DefaultCliLogger( - private val logger: Logger = Logger.getLogger(Main::class.java.name), + private val logger: Logger = Logger.getLogger(MainCommand::class.java.name), private val errorLogger: Logger = Logger.getLogger(logger.name + "Err") ) : CliLogger {