chore(release): 1.3.1 [skip ci]

## [1.3.1](https://github.com/revanced/revanced-cli/compare/v1.3.0...v1.3.1) (2022-06-13)

### Bug Fixes

* check if `packageVersion` is compatible with any from `compatiblePackages` ([32589c8](32589c88e4))

.releaserc

@@ -10,7 +10,6 @@
     "@semantic-release/commit-analyzer",
     "@semantic-release/release-notes-generator",
     "@semantic-release/changelog",
-    "gradle-semantic-release-plugin",
     [
       "@semantic-release/git",
       {
@@ -20,6 +19,15 @@
         ]
       }
     ],
-    "@semantic-release/github"
+    [
+      "@semantic-release/github",
+      {
+        "assets": [
+          {
+            "path": "build/libs/*.jar"
+          }
+        ]
+      }
+    ]
   ]
-}
+}

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.3.1](https://github.com/revanced/revanced-cli/compare/v1.3.0...v1.3.1) (2022-06-13)
+
+
+### Bug Fixes
+
+* check if `packageVersion` is compatible with any from `compatiblePackages` ([32589c8](https://github.com/revanced/revanced-cli/commit/32589c88e438e0a1375c256e9bb8a93f5a4d319b))
+
 # [1.3.0](https://github.com/revanced/revanced-cli/compare/v1.2.0...v1.3.0) (2022-06-11)
 
 

build.gradle.kts

@@ -1,42 +1,42 @@
 plugins {
-    kotlin("jvm") version "1.6.21"
+    kotlin("jvm") version "1.7.0"
     id("com.github.johnrengelman.shadow") version "7.1.2"
-    java
-    `maven-publish`
 }
 
 group = "app.revanced"
 
+val githubUsername: String = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
+val githubPassword: String = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN")
+
 repositories {
     mavenCentral()
-    google()
-    mavenLocal()
     maven {
         url = uri("https://maven.pkg.github.com/revanced/multidexlib2")
         credentials {
-            username = project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_ACTOR") // DO NOT CHANGE!
-            password = project.findProperty("gpr.key") as String? ?: System.getenv("GITHUB_TOKEN") // DO NOT CHANGE!
+            username = githubUsername
+            password = githubPassword
         }
     }
     maven {
-        url = uri("https://jitpack.io")
+        url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
+        credentials {
+            username = githubUsername
+            password = githubPassword
+        }
     }
+    maven { url = uri("https://jitpack.io") }
+    google()
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.7.0")
     implementation("app.revanced:revanced-patcher:1.1.0")
 
     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
     implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.21")
-}
-
-java {
-    withSourcesJar()
-    withJavadocJar()
+    implementation("org.jetbrains.kotlin:kotlin-reflect:1.7.0")
 }
 
 tasks {
@@ -50,22 +50,4 @@ tasks {
             attributes("Implementation-Version" to project.version)
         }
     }
-}
-
-publishing {
-    repositories {
-        maven {
-            name = "GitHubPackages"
-            url = uri("https://maven.pkg.github.com/revanced/revanced-cli")
-            credentials {
-                username = System.getenv("GITHUB_ACTOR")
-                password = System.getenv("GITHUB_TOKEN")
-            }
-        }
-    }
-    publications {
-        register<MavenPublication>("gpr") {
-            from(components["java"])
-        }
-    }
-}
+}

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

@@ -36,14 +36,14 @@ fun Patcher.addPatchesFiltered(
             }
 
             if (compatiblePackages == null) println("$prefix: Missing compatibility annotation. Continuing.")
-            else compatiblePackages.forEach { compatiblePackage ->
-                if (compatiblePackage.name != packageName) {
-                    println("$prefix: Package name not matching ${compatiblePackage.name}.")
+            else {
+                if (!compatiblePackages.any { it.name == packageName }) {
+                    println("$prefix: Incompatible package.")
                     return@patch
                 }
 
-                if (!(debugging || compatiblePackage.versions.any { it == packageVersion })) {
-                    println("$prefix: Unsupported version.")
+                if (!(debugging || compatiblePackages.any { it.versions.isEmpty() || it.versions.any { version -> version == packageVersion }})) {
+                    println("$prefix: The package version is $packageVersion and is incompatible.")
                     return@patch
                 }
             }