From d09aca65dfd3d70052f8e3162fc6349685624c34 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Fri, 15 Sep 2023 03:00:34 +0200 Subject: [PATCH] chore: Move ReVanced CLI to subproject --- build.gradle.kts | 58 ++----------------- revanced-cli/build.gradle.kts | 55 ++++++++++++++++++ .../cli/command/ListPatchesCommand.kt | 0 .../app/revanced/cli/command/MainCommand.kt | 0 .../revanced/cli/command/OptionsCommand.kt | 0 .../app/revanced/cli/command/PatchCommand.kt | 0 .../cli/command/utility/InstallCommand.kt | 0 .../cli/command/utility/UninstallCommand.kt | 0 .../cli/command/utility/UtilityCommand.kt | 0 .../main/kotlin/app/revanced/utils/Options.kt | 0 .../app/revanced/utils/adb/AdbManager.kt | 0 .../kotlin/app/revanced/utils/adb/Commands.kt | 0 .../app/revanced/utils/adb/Constants.kt | 0 .../app/revanced/utils/align/ZipAligner.kt | 0 .../revanced/utils/align/zip/Extensions.kt | 0 .../app/revanced/utils/align/zip/ZipFile.kt | 0 .../align/zip/structures/ZipEndRecord.kt | 0 .../utils/align/zip/structures/ZipEntry.kt | 0 .../app/revanced/utils/signing/ApkSigner.kt | 0 .../revanced/utils/signing/SigningOptions.kt | 0 .../app/revanced/cli/version.properties | 0 .../patcher/options/PatchOptionsTest.kt | 0 settings.gradle.kts | 2 +- 23 files changed, 60 insertions(+), 55 deletions(-) create mode 100644 revanced-cli/build.gradle.kts rename {src => revanced-cli/src}/main/kotlin/app/revanced/cli/command/ListPatchesCommand.kt (100%) rename {src => revanced-cli/src}/main/kotlin/app/revanced/cli/command/MainCommand.kt (100%) rename {src => revanced-cli/src}/main/kotlin/app/revanced/cli/command/OptionsCommand.kt (100%) rename {src => revanced-cli/src}/main/kotlin/app/revanced/cli/command/PatchCommand.kt (100%) rename {src => revanced-cli/src}/main/kotlin/app/revanced/cli/command/utility/InstallCommand.kt (100%) rename {src => revanced-cli/src}/main/kotlin/app/revanced/cli/command/utility/UninstallCommand.kt (100%) rename {src => revanced-cli/src}/main/kotlin/app/revanced/cli/command/utility/UtilityCommand.kt (100%) rename {src => revanced-cli/src}/main/kotlin/app/revanced/utils/Options.kt (100%) rename {src => revanced-cli/src}/main/kotlin/app/revanced/utils/adb/AdbManager.kt (100%) rename {src => revanced-cli/src}/main/kotlin/app/revanced/utils/adb/Commands.kt (100%) rename {src => revanced-cli/src}/main/kotlin/app/revanced/utils/adb/Constants.kt (100%) rename {src => revanced-cli/src}/main/kotlin/app/revanced/utils/align/ZipAligner.kt (100%) rename {src => revanced-cli/src}/main/kotlin/app/revanced/utils/align/zip/Extensions.kt (100%) rename {src => revanced-cli/src}/main/kotlin/app/revanced/utils/align/zip/ZipFile.kt (100%) rename {src => revanced-cli/src}/main/kotlin/app/revanced/utils/align/zip/structures/ZipEndRecord.kt (100%) rename {src => revanced-cli/src}/main/kotlin/app/revanced/utils/align/zip/structures/ZipEntry.kt (100%) rename {src => revanced-cli/src}/main/kotlin/app/revanced/utils/signing/ApkSigner.kt (100%) rename {src => revanced-cli/src}/main/kotlin/app/revanced/utils/signing/SigningOptions.kt (100%) rename {src => revanced-cli/src}/main/resources/app/revanced/cli/version.properties (100%) rename {src => revanced-cli/src}/test/kotlin/app/revanced/patcher/options/PatchOptionsTest.kt (100%) diff --git a/build.gradle.kts b/build.gradle.kts index 9c6b335..f03e3dd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,57 +1,7 @@ plugins { - kotlin("jvm") version "1.8.20" - alias(libs.plugins.shadow) + kotlin("jvm") version "1.9.0" apply false } -group = "app.revanced" - -dependencies { - implementation(libs.revanced.patcher) - implementation(libs.kotlin.reflect) - implementation(libs.kotlinx.coroutines.core) - implementation(libs.picocli) - implementation(libs.jadb) // Updated fork - implementation(libs.apksig) - implementation(libs.bcpkix.jdk15on) - implementation(libs.jackson.module.kotlin) - testImplementation(libs.kotlin.test) -} - -kotlin { jvmToolchain(11) } - -tasks { - test { - useJUnitPlatform() - testLogging { - events("PASSED", "SKIPPED", "FAILED") - } - } - - processResources { - expand("projectVersion" to project.version) - } - - shadowJar { - manifest { - attributes("Main-Class" to "app.revanced.cli.command.MainCommandKt") - } - minimize { - exclude(dependency("org.jetbrains.kotlin:.*")) - exclude(dependency("org.bouncycastle:.*")) - exclude(dependency("app.revanced:.*")) - } - } - - build { - dependsOn(shadowJar) - } - - // Dummy task to fix the Gradle semantic-release plugin. - // Remove this if you forked it to support building only. - // Tracking issue: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435 - register("publish") { - group = "publish" - description = "Dummy task" - dependsOn(build) - } -} +allprojects { + group = "app.revanced" +} \ No newline at end of file diff --git a/revanced-cli/build.gradle.kts b/revanced-cli/build.gradle.kts new file mode 100644 index 0000000..3912e5f --- /dev/null +++ b/revanced-cli/build.gradle.kts @@ -0,0 +1,55 @@ +plugins { + kotlin("jvm") version "1.9.0" + alias(libs.plugins.shadow) +} + +dependencies { + implementation(libs.revanced.patcher) + implementation(libs.kotlin.reflect) + implementation(libs.kotlinx.coroutines.core) + implementation(libs.picocli) + implementation(libs.jadb) // Updated fork + implementation(libs.apksig) + implementation(libs.bcpkix.jdk15on) + implementation(libs.jackson.module.kotlin) + testImplementation(libs.kotlin.test) +} + +kotlin { jvmToolchain(11) } + +tasks { + test { + useJUnitPlatform() + testLogging { + events("PASSED", "SKIPPED", "FAILED") + } + } + + processResources { + expand("projectVersion" to project.version) + } + + shadowJar { + manifest { + attributes("Main-Class" to "app.revanced.cli.command.MainCommandKt") + } + minimize { + exclude(dependency("org.jetbrains.kotlin:.*")) + exclude(dependency("org.bouncycastle:.*")) + exclude(dependency("app.revanced:.*")) + } + } + + build { + dependsOn(shadowJar) + } + + // Dummy task to fix the Gradle semantic-release plugin. + // Remove this if you forked it to support building only. + // Tracking issue: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435 + register("publish") { + group = "publish" + description = "Dummy task" + dependsOn(build) + } +} diff --git a/src/main/kotlin/app/revanced/cli/command/ListPatchesCommand.kt b/revanced-cli/src/main/kotlin/app/revanced/cli/command/ListPatchesCommand.kt similarity index 100% rename from src/main/kotlin/app/revanced/cli/command/ListPatchesCommand.kt rename to revanced-cli/src/main/kotlin/app/revanced/cli/command/ListPatchesCommand.kt diff --git a/src/main/kotlin/app/revanced/cli/command/MainCommand.kt b/revanced-cli/src/main/kotlin/app/revanced/cli/command/MainCommand.kt similarity index 100% rename from src/main/kotlin/app/revanced/cli/command/MainCommand.kt rename to revanced-cli/src/main/kotlin/app/revanced/cli/command/MainCommand.kt diff --git a/src/main/kotlin/app/revanced/cli/command/OptionsCommand.kt b/revanced-cli/src/main/kotlin/app/revanced/cli/command/OptionsCommand.kt similarity index 100% rename from src/main/kotlin/app/revanced/cli/command/OptionsCommand.kt rename to revanced-cli/src/main/kotlin/app/revanced/cli/command/OptionsCommand.kt diff --git a/src/main/kotlin/app/revanced/cli/command/PatchCommand.kt b/revanced-cli/src/main/kotlin/app/revanced/cli/command/PatchCommand.kt similarity index 100% rename from src/main/kotlin/app/revanced/cli/command/PatchCommand.kt rename to revanced-cli/src/main/kotlin/app/revanced/cli/command/PatchCommand.kt diff --git a/src/main/kotlin/app/revanced/cli/command/utility/InstallCommand.kt b/revanced-cli/src/main/kotlin/app/revanced/cli/command/utility/InstallCommand.kt similarity index 100% rename from src/main/kotlin/app/revanced/cli/command/utility/InstallCommand.kt rename to revanced-cli/src/main/kotlin/app/revanced/cli/command/utility/InstallCommand.kt diff --git a/src/main/kotlin/app/revanced/cli/command/utility/UninstallCommand.kt b/revanced-cli/src/main/kotlin/app/revanced/cli/command/utility/UninstallCommand.kt similarity index 100% rename from src/main/kotlin/app/revanced/cli/command/utility/UninstallCommand.kt rename to revanced-cli/src/main/kotlin/app/revanced/cli/command/utility/UninstallCommand.kt diff --git a/src/main/kotlin/app/revanced/cli/command/utility/UtilityCommand.kt b/revanced-cli/src/main/kotlin/app/revanced/cli/command/utility/UtilityCommand.kt similarity index 100% rename from src/main/kotlin/app/revanced/cli/command/utility/UtilityCommand.kt rename to revanced-cli/src/main/kotlin/app/revanced/cli/command/utility/UtilityCommand.kt diff --git a/src/main/kotlin/app/revanced/utils/Options.kt b/revanced-cli/src/main/kotlin/app/revanced/utils/Options.kt similarity index 100% rename from src/main/kotlin/app/revanced/utils/Options.kt rename to revanced-cli/src/main/kotlin/app/revanced/utils/Options.kt diff --git a/src/main/kotlin/app/revanced/utils/adb/AdbManager.kt b/revanced-cli/src/main/kotlin/app/revanced/utils/adb/AdbManager.kt similarity index 100% rename from src/main/kotlin/app/revanced/utils/adb/AdbManager.kt rename to revanced-cli/src/main/kotlin/app/revanced/utils/adb/AdbManager.kt diff --git a/src/main/kotlin/app/revanced/utils/adb/Commands.kt b/revanced-cli/src/main/kotlin/app/revanced/utils/adb/Commands.kt similarity index 100% rename from src/main/kotlin/app/revanced/utils/adb/Commands.kt rename to revanced-cli/src/main/kotlin/app/revanced/utils/adb/Commands.kt diff --git a/src/main/kotlin/app/revanced/utils/adb/Constants.kt b/revanced-cli/src/main/kotlin/app/revanced/utils/adb/Constants.kt similarity index 100% rename from src/main/kotlin/app/revanced/utils/adb/Constants.kt rename to revanced-cli/src/main/kotlin/app/revanced/utils/adb/Constants.kt diff --git a/src/main/kotlin/app/revanced/utils/align/ZipAligner.kt b/revanced-cli/src/main/kotlin/app/revanced/utils/align/ZipAligner.kt similarity index 100% rename from src/main/kotlin/app/revanced/utils/align/ZipAligner.kt rename to revanced-cli/src/main/kotlin/app/revanced/utils/align/ZipAligner.kt diff --git a/src/main/kotlin/app/revanced/utils/align/zip/Extensions.kt b/revanced-cli/src/main/kotlin/app/revanced/utils/align/zip/Extensions.kt similarity index 100% rename from src/main/kotlin/app/revanced/utils/align/zip/Extensions.kt rename to revanced-cli/src/main/kotlin/app/revanced/utils/align/zip/Extensions.kt diff --git a/src/main/kotlin/app/revanced/utils/align/zip/ZipFile.kt b/revanced-cli/src/main/kotlin/app/revanced/utils/align/zip/ZipFile.kt similarity index 100% rename from src/main/kotlin/app/revanced/utils/align/zip/ZipFile.kt rename to revanced-cli/src/main/kotlin/app/revanced/utils/align/zip/ZipFile.kt diff --git a/src/main/kotlin/app/revanced/utils/align/zip/structures/ZipEndRecord.kt b/revanced-cli/src/main/kotlin/app/revanced/utils/align/zip/structures/ZipEndRecord.kt similarity index 100% rename from src/main/kotlin/app/revanced/utils/align/zip/structures/ZipEndRecord.kt rename to revanced-cli/src/main/kotlin/app/revanced/utils/align/zip/structures/ZipEndRecord.kt diff --git a/src/main/kotlin/app/revanced/utils/align/zip/structures/ZipEntry.kt b/revanced-cli/src/main/kotlin/app/revanced/utils/align/zip/structures/ZipEntry.kt similarity index 100% rename from src/main/kotlin/app/revanced/utils/align/zip/structures/ZipEntry.kt rename to revanced-cli/src/main/kotlin/app/revanced/utils/align/zip/structures/ZipEntry.kt diff --git a/src/main/kotlin/app/revanced/utils/signing/ApkSigner.kt b/revanced-cli/src/main/kotlin/app/revanced/utils/signing/ApkSigner.kt similarity index 100% rename from src/main/kotlin/app/revanced/utils/signing/ApkSigner.kt rename to revanced-cli/src/main/kotlin/app/revanced/utils/signing/ApkSigner.kt diff --git a/src/main/kotlin/app/revanced/utils/signing/SigningOptions.kt b/revanced-cli/src/main/kotlin/app/revanced/utils/signing/SigningOptions.kt similarity index 100% rename from src/main/kotlin/app/revanced/utils/signing/SigningOptions.kt rename to revanced-cli/src/main/kotlin/app/revanced/utils/signing/SigningOptions.kt diff --git a/src/main/resources/app/revanced/cli/version.properties b/revanced-cli/src/main/resources/app/revanced/cli/version.properties similarity index 100% rename from src/main/resources/app/revanced/cli/version.properties rename to revanced-cli/src/main/resources/app/revanced/cli/version.properties diff --git a/src/test/kotlin/app/revanced/patcher/options/PatchOptionsTest.kt b/revanced-cli/src/test/kotlin/app/revanced/patcher/options/PatchOptionsTest.kt similarity index 100% rename from src/test/kotlin/app/revanced/patcher/options/PatchOptionsTest.kt rename to revanced-cli/src/test/kotlin/app/revanced/patcher/options/PatchOptionsTest.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index 9bd8dc7..01e6885 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -20,4 +20,4 @@ dependencyResolutionManagement { } } -rootProject.name = "revanced-cli" \ No newline at end of file +include("revanced-cli")