perf: rollback: Move ReVanced Library subproject to another repository …

…995f2ec

This commit is to apply changes to the ReVanced Library.

Ideally I would create a new ReVanced Library fork and add my changes there.
In that case, in order to use github actions, there will be the inconvenience of having to release a new fork in Maven Central.

To prevent this I merge ReVanced Library 1.5.0 into ReVanced CLI.

.releaserc

@@ -31,7 +31,7 @@
       {
         "assets": [
           {
-            "path": "build/libs/*all.jar"
+            "path": "revanced-cli/build/libs/*all.jar"
           }
         ],
         successComment: false

build.gradle.kts

@@ -1,70 +1,7 @@
 plugins {
-    kotlin("jvm") version "1.9.10"
-    alias(libs.plugins.shadow)
+    kotlin("jvm") version "1.9.22" apply false
 }
 
-group = "app.revanced"
-
-repositories {
-    mavenCentral()
-    mavenLocal()
-    google()
-    maven { url = uri("https://jitpack.io") }
-}
-
-dependencies {
-    implementation(libs.revanced.patcher)
-    implementation(libs.revanced.library)
-    implementation(libs.kotlinx.coroutines.core)
-    implementation(libs.picocli)
-
-    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 hack gradle-semantic-release-plugin to release this project.
-
-    Explanation:
-    SemVer is a standard for versioning libraries.
-    For that reason the semantic-release plugin uses the "publish" task to publish libraries.
-    However, this subproject is not a library, and the "publish" task is not available for this subproject.
-    Because semantic-release is not designed to handle this case, we need to hack it.
-
-    RE: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
-     */
-
-    register<DefaultTask>("publish") {
-        group = "publishing"
-        description = "Dummy task to hack gradle-semantic-release-plugin to release ReVanced CLI"
-        dependsOn(build)
-    }
-}
+allprojects {
+    group = "app.revanced"
+}

gradle/libs.versions.toml

@@ -1,17 +1,25 @@
 [versions]
 shadow = "8.1.1"
-kotlin-test = "1.9.20"
+apksig = "8.2.0"
+bcpkix-jdk18on = "1.76"
+jackson-module-kotlin = "2.16.1"
+jadb = "1.2.1"
+kotlin-reflect = "1.9.22"
+kotlin-test = "1.9.22"
 kotlinx-coroutines-core = "1.7.3"
-picocli = "4.7.3"
+picocli = "4.7.5"
 revanced-patcher = "19.1.0"
-revanced-library = "1.4.0"
 
 [libraries]
+apksig = { module = "com.android.tools.build:apksig", version.ref = "apksig" }
+bcpkix-jdk18on = { module = "org.bouncycastle:bcpkix-jdk18on", version.ref = "bcpkix-jdk18on" }
+jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson-module-kotlin" }
+jadb = { module = "app.revanced:jadb", version.ref = "jadb" }
+kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin-reflect" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin-test" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines-core" }
 picocli = { module = "info.picocli:picocli", version.ref = "picocli" }
 revanced-patcher = { module = "app.revanced:revanced-patcher", version.ref = "revanced-patcher" }
-revanced-library = { module = "app.revanced:revanced-library", version.ref = "revanced-library" }
 
 [plugins]
 shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }

revanced-cli/build.gradle.kts

@@ -0,0 +1,52 @@
+plugins {
+    kotlin("jvm") version "1.9.22"
+    alias(libs.plugins.shadow)
+}
+
+dependencies {
+    implementation(project(":revanced-lib"))
+    implementation(libs.revanced.patcher)
+    implementation(libs.kotlinx.coroutines.core)
+    implementation(libs.picocli)
+
+    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<DefaultTask>("publish") {
+        group = "publish"
+        description = "Dummy task"
+        dependsOn(build)
+    }
+}

revanced-cli/settings.gradle.kts

@@ -0,0 +1 @@
+rootProject.name = "revanced-cli"

revanced-lib/build.gradle.kts

@@ -0,0 +1,21 @@
+plugins {
+    kotlin("jvm") version "1.9.22"
+}
+
+dependencies {
+    implementation(libs.revanced.patcher)
+    implementation(libs.kotlin.reflect)
+    implementation(libs.jadb) // Updated fork
+    implementation(libs.apksig)
+    implementation(libs.bcpkix.jdk18on)
+    implementation(libs.jackson.module.kotlin)
+}
+
+tasks {
+}
+
+kotlin { jvmToolchain(11) }
+
+java {
+    withSourcesJar()
+}

revanced-lib/settings.gradle.kts

@@ -0,0 +1 @@
+rootProject.name = "revanced-lib"