chore(release): 2.1.0 [skip ci]

# [2.1.0](https://github.com/revanced/revanced-cli/compare/v2.0.5...v2.1.0) (2022-07-03)

### Features

* `--include` option ([#76](https://github.com/revanced/revanced-cli/issues/76)) ([57a1e7c](57a1e7c27f))

.releaserc

@@ -7,7 +7,11 @@
     }
   ],
   "plugins": [
-    "@semantic-release/commit-analyzer",
+    ["@semantic-release/commit-analyzer", {
+      "releaseRules": [
+        {"type": "build", "release": "patch"}
+      ]
+    }],
     "@semantic-release/release-notes-generator",
     "@semantic-release/changelog",
     "gradle-semantic-release-plugin",

CHANGELOG.md

@@ -1,3 +1,49 @@
+# [2.1.0](https://github.com/revanced/revanced-cli/compare/v2.0.5...v2.1.0) (2022-07-03)
+
+
+### Features
+
+* `--include` option ([#76](https://github.com/revanced/revanced-cli/issues/76)) ([57a1e7c](https://github.com/revanced/revanced-cli/commit/57a1e7c27fb0c4292e08332b88ccd57d69fa02c6))
+
+## [2.0.5](https://github.com/revanced/revanced-cli/compare/v2.0.4...v2.0.5) (2022-06-29)
+
+## [2.0.4](https://github.com/revanced/revanced-cli/compare/v2.0.3...v2.0.4) (2022-06-28)
+
+## [2.0.3](https://github.com/revanced/revanced-cli/compare/v2.0.2...v2.0.3) (2022-06-27)
+
+
+### Bug Fixes
+
+* wrong keystore output path ([20fa179](https://github.com/revanced/revanced-cli/commit/20fa17957e3e454b9755bc7b9b473b6c578cc593))
+
+## [2.0.2](https://github.com/revanced/revanced-cli/compare/v2.0.1...v2.0.2) (2022-06-27)
+
+
+### Bug Fixes
+
+* wrong separator when using `ZipFileSystemUtils` ([20e15de](https://github.com/revanced/revanced-cli/commit/20e15defc2b90aa5e79bad41c097bd0db8d5e12a))
+
+## [2.0.1](https://github.com/revanced/revanced-cli/compare/v2.0.0...v2.0.1) (2022-06-26)
+
+# [2.0.0](https://github.com/revanced/revanced-cli/compare/v1.11.1...v2.0.0) (2022-06-26)
+
+
+### Code Refactoring
+
+* migrate from `Signature` to `Fingerprint` ([88852a4](https://github.com/revanced/revanced-cli/commit/88852a45ac90ad9419c18f0cb3395745e62eadbf))
+
+
+### BREAKING CHANGES
+
+* Not backwards compatible, since a lot of classes where renamed.
+
+## [1.11.1](https://github.com/revanced/revanced-cli/compare/v1.11.0...v1.11.1) (2022-06-25)
+
+
+### Bug Fixes
+
+* update patcher version ([499ce0a](https://github.com/revanced/revanced-cli/commit/499ce0a6fb1993ad48ffdd9c9e8307e8d0c179c6))
+
 # [1.11.0](https://github.com/revanced/revanced-cli/compare/v1.10.2...v1.11.0) (2022-06-23)
 
 

build.gradle.kts

@@ -10,13 +10,7 @@ val githubPassword: String = project.findProperty("gpr.key") as? String ?: Syste
 
 repositories {
     mavenCentral()
-    maven {
-        url = uri("https://maven.pkg.github.com/revanced/multidexlib2")
-        credentials {
-            username = githubUsername
-            password = githubPassword
-        }
-    }
+    mavenLocal()
     maven {
         url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
         credentials {
@@ -32,7 +26,7 @@ dependencies {
     implementation(kotlin("stdlib"))
     implementation(kotlin("reflect"))
 
-    implementation("app.revanced:revanced-patcher:1.10.0")
+    implementation("app.revanced:revanced-patcher:2.1.2")
     implementation("info.picocli:picocli:4.6.3")
     implementation("com.android.tools.build:apksig:7.2.1")
     implementation("com.github.revanced:jadb:master-SNAPSHOT") // updated fork

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 1.11.0
+version = 2.1.0

src/main/kotlin/app/revanced/cli/command/MainCommand.kt

@@ -57,6 +57,9 @@ internal object MainCommand : Runnable {
         @Option(names = ["-e", "--exclude"], description = ["Explicitly exclude patches"])
         var excludedPatches = arrayOf<String>()
 
+        @Option(names = ["-i", "--include"], description = ["Include patches"])
+        var includedPatches = arrayOf<String>()
+
         @Option(names = ["-r", "--resource-patcher"], description = ["Disable patching resources"])
         var disableResourcePatching: Boolean = false
 
@@ -130,7 +133,7 @@ internal object MainCommand : Runnable {
                     args.password,
                     args.keystorePath ?: outputFile.absoluteFile.parentFile
                         .resolve("${outputFile.nameWithoutExtension}.keystore")
-                        .name
+                        .canonicalPath
                 )
             )
         }

src/main/kotlin/app/revanced/cli/patcher/Patcher.kt

@@ -25,23 +25,23 @@ internal object Patcher {
         args.inputFile.copyTo(output)
 
         val result = patcher.save()
-        val inputFile = if (!args.disableResourcePatching && result.resourceFile != null) {
-            result.resourceFile
-        } else null
-        ZipFileSystemUtils(inputFile, output).use { fileSystem ->
+        ZipFileSystemUtils(output).use { outputFileSystem ->
             // replace all dex files
             result.dexFiles.forEach {
                 logger.info("Writing dex file ${it.name}")
-                fileSystem.write(it.name, it.dexFileInputStream.readAllBytes())
+                outputFileSystem.write(it.name, it.dexFileInputStream.readAllBytes())
             }
 
-            // inputFile being null implies resource patching being disabled
-            if (inputFile != null) {
-                // write resources
-                logger.info("Writing resources")
-                fileSystem.writeInput()
-                fileSystem.uncompress(*result.doNotCompress!!.toTypedArray())
+            if (!args.disableResourcePatching) {
+                logger.info("Writing resources...")
+
+                ZipFileSystemUtils(result.resourceFile!!).use { resourceFileSystem ->
+                    val resourceFiles = resourceFileSystem.getFile(File.separator)
+                    outputFileSystem.writePathRecursively(resourceFiles)
+                }
             }
+
+            outputFileSystem.uncompress(*result.doNotCompress!!.toTypedArray())
         }
     }
 }

src/main/kotlin/app/revanced/utils/adb/Adb.kt

@@ -58,7 +58,7 @@ internal class Adb(
                 Constants.PATH_INIT_PUSH,
                 Constants.CONTENT_UMOUNT_SCRIPT.replacePlaceholder()
             )
-            // install mount script
+            // install unmount script
             device.run(Constants.COMMAND_INSTALL_UMOUNT.replacePlaceholder())
 
             // unmount the apk for sanity
@@ -103,4 +103,4 @@ internal class Adb(
         process.destroy()
         executor.shutdown()
     }
-}
+}

src/main/kotlin/app/revanced/utils/filesystem/ZipFileSystemUtils.kt

@@ -7,15 +7,14 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.util.zip.ZipEntry
 
-internal class ZipFileSystemUtils(input: File?, output: File) : Closeable {
-    private val inFileSystem = if (input != null) {
-        FileSystems.newFileSystem(input.toPath())
-    } else null
-    private val outFileSystem = FileSystems.newFileSystem(output.toPath(), mapOf("noCompression" to true))
+internal class ZipFileSystemUtils(
+    file: File
+) : Closeable {
+    private var zipFileSystem = FileSystems.newFileSystem(file.toPath(), mapOf("noCompression" to true))
 
     private fun Path.deleteRecursively() {
         if (!Files.exists(this)) {
-            throw IllegalStateException("File exists in input but not in output, cannot delete")
+            throw IllegalStateException("File exists in real folder but not in zip file system")
         }
 
         if (Files.isDirectory(this)) {
@@ -27,25 +26,21 @@ internal class ZipFileSystemUtils(input: File?, output: File) : Closeable {
         Files.delete(this)
     }
 
-    internal fun writeInput() {
-        if (inFileSystem == null) {
-            throw IllegalArgumentException("Input file not set")
-        }
-        val root = inFileSystem.getPath(inFileSystem.separator)
+    internal fun getFile(path: String) = zipFileSystem.getPath(path)
 
-        Files.list(root).close()
-
-        Files.list(root).also { fileStream ->
+    internal fun writePathRecursively(path: Path) {
+        Files.list(path).use { fileStream ->
             fileStream.forEach { filePath ->
-                val fileSystemPath = filePath.getRelativePath(root)
+                val fileSystemPath = filePath.getRelativePath(path)
                 fileSystemPath.deleteRecursively()
             }
-        }.close()
+        }
 
-        Files.walk(root).also { fileStream ->
-            // don't include build directory by skipping the root node.
+        Files.walk(path).use { fileStream ->
+            // don't include build directory
+            // by skipping the root node.
             fileStream.skip(1).forEach { filePath ->
-                val relativePath = filePath.getRelativePath(root)
+                val relativePath = filePath.getRelativePath(path)
 
                 if (Files.isDirectory(filePath)) {
                     Files.createDirectory(relativePath)
@@ -54,18 +49,16 @@ internal class ZipFileSystemUtils(input: File?, output: File) : Closeable {
 
                 Files.copy(filePath, relativePath)
             }
-        }.close()
+        }
     }
 
-    internal fun write(path: String, content: ByteArray) = Files.write(outFileSystem.getPath(path), content)
+    internal fun write(path: String, content: ByteArray) = Files.write(zipFileSystem.getPath(path), content)
 
-    private fun Path.getRelativePath(path: Path): Path = outFileSystem.getPath(path.relativize(this).toString())
+    private fun Path.getRelativePath(path: Path): Path = zipFileSystem.getPath(path.relativize(this).toString())
 
+    // TODO: figure out why the file system is uncompressed by default and how to fix it
     internal fun uncompress(vararg paths: String) =
-        paths.forEach { Files.setAttribute(outFileSystem.getPath(it), "zip:method", ZipEntry.STORED) }
+        paths.forEach { Files.setAttribute(zipFileSystem.getPath(it), "zip:method", ZipEntry.STORED) }
 
-    override fun close() {
-        inFileSystem?.close()
-        outFileSystem.close()
-    }
+    override fun close() = zipFileSystem.close()
 }

src/main/kotlin/app/revanced/utils/patcher/Patcher.kt

@@ -4,11 +4,11 @@ import app.revanced.cli.command.MainCommand
 import app.revanced.cli.command.MainCommand.args
 import app.revanced.cli.command.MainCommand.logger
 import app.revanced.patcher.Patcher
-import app.revanced.patcher.data.base.Data
+import app.revanced.patcher.data.Data
 import app.revanced.patcher.extensions.PatchExtensions.compatiblePackages
 import app.revanced.patcher.extensions.PatchExtensions.include
 import app.revanced.patcher.extensions.PatchExtensions.patchName
-import app.revanced.patcher.patch.base.Patch
+import app.revanced.patcher.patch.Patch
 import app.revanced.patcher.util.patch.implementation.JarPatchBundle
 
 fun Patcher.addPatchesFiltered(
@@ -30,7 +30,7 @@ fun Patcher.addPatchesFiltered(
             if (excludePatches && args.excludedPatches.contains(patchName)) {
                 logger.info("$prefix: Explicitly excluded")
                 return@patch
-            } else if (!patch.include) {
+            } else if (!patch.include && !args.includedPatches.contains(patchName)) {
                 logger.info("$prefix: Explicitly excluded")
                 return@patch
             }

src/main/kotlin/app/revanced/utils/signature/Signature.kt

@@ -1,54 +0,0 @@
-package app.revanced.utils.signature
-
-import app.revanced.patcher.Patcher
-
-object Signature {
-
-    fun checkSignatures(patcher: Patcher) {
-        TODO()
-        /**
-        val failed = mutableListOf<String>()
-        for (signature in patcher.resolveSignatures()) {
-        val signatureClass = signature::class.java
-        val signatureName = signature.name ?: signatureClass.simpleName
-        if (!signature.resolved) {
-        failed.add(signatureName)
-        continue
-        }
-
-        val method = signature.result!!.method
-        val matchingMethod = signature.matchingMethod ?: MatchingMethod()
-
-        println(
-        """
-        [Signature] $signatureName
-        [Method] ${matchingMethod.definingClass}->${matchingMethod.name}
-        [Match] ${method.definingClass}->${method.toStr()}
-        """.trimIndent()
-        )
-
-        signature.fuzzyThreshold.let {
-        val warnings = signature.result!!.scanResult.warnings!!
-        println(
-        """
-        [Warnings: ${warnings.count()}]
-        ${warnings.joinToString(separator = "\n") { warning -> "${warning.instructionIndex} / ${warning.patternIndex}: ${warning.wrongOpcode} (expected: ${warning.correctOpcode})" }}
-        """.trimIndent()
-        )
-        }
-        }
-
-        println(
-        """
-        ${"=".repeat(50)}
-        [Failed signatures: ${failed.size}]
-        ${failed.joinToString(separator = "\n") { it }}
-        """.trimIndent()
-        )
-         */
-    }
-
-    //private fun Method.toStr(): String {
-    //    return "${this.name}(${this.parameterTypes.joinToString("")})${this.returnType}"
-    //}
-}