chore: merge branch dev to main (#178)

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [2.18.1-dev.1](https://github.com/revanced/revanced-cli/compare/v2.18.0...v2.18.1-dev.1) (2022-12-15)
+
+
+### Bug Fixes
+
+* don't log when package is incompatible and `exclusive` option is used ([ad81a1b](https://github.com/revanced/revanced-cli/commit/ad81a1b656586226f8b7b8d1123c52b0f3f2e6f7))
+
 # [2.18.0](https://github.com/revanced/revanced-cli/compare/v2.17.0...v2.18.0) (2022-12-15)
 
 

build.gradle.kts

@@ -43,6 +43,7 @@ tasks {
         }
         minimize {
             exclude(dependency("org.jetbrains.kotlin:.*"))
+            exclude(dependency("org.bouncycastle:.*"))
         }
     }
     // Dummy task to fix the Gradle semantic-release plugin.

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.18.0
+version = 2.18.1-dev.1

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

@@ -87,7 +87,7 @@ internal object MainCommand : Runnable {
             names = ["--exclusive"],
             description = ["Only installs the patches you include, not including any patch by default"]
         )
-        var defaultExclude = false
+        var exclusive = false
 
         @Option(names = ["-i", "--include"], description = ["Include patches"])
         var includedPatches = arrayOf<String>()

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

@@ -18,18 +18,9 @@ fun Patcher.addPatchesFiltered(allPatches: List<Class<out Patch<Context>>>) {
     allPatches.forEach patchLoop@{ patch ->
         val compatiblePackages = patch.compatiblePackages
         val patchName = patch.patchName
-
-        val prefix = "Skipping $patchName"
-
         val args = MainCommand.args.patchArgs?.patchingArgs!!
 
-        if (args.excludedPatches.contains(patchName)) {
+        val prefix = "Skipping $patchName"
-            logger.info("$prefix: Manually excluded")
-            return@patchLoop
-        } else if ((!patch.include || args.defaultExclude) && !args.includedPatches.contains(patchName)) {
-            logger.info("$prefix: Excluded by default")
-            return@patchLoop
-        }
 
         if (compatiblePackages == null) logger.trace("$patchName: No constraint on packages.")
         else {
@@ -51,6 +42,14 @@ fun Patcher.addPatchesFiltered(allPatches: List<Class<out Patch<Context>>>) {
             }
         }
 
+        if (args.excludedPatches.contains(patchName)) {
+            logger.info("$prefix: Manually excluded")
+            return@patchLoop
+        } else if ((!patch.include || args.exclusive) && !args.includedPatches.contains(patchName)) {
+            logger.info("$prefix: Excluded by default")
+            return@patchLoop
+        }
+
         logger.trace("Adding $patchName")
         includedPatches.add(patch)
     }