chore(release): 1.4.4 [skip ci]

## [1.4.4](https://github.com/revanced/revanced-cli/compare/v1.4.3...v1.4.4) (2022-06-18)

### Bug Fixes

* add execute permission to `./gradlew` file ([#36](https://github.com/revanced/revanced-cli/issues/36)) ([072d9e1](072d9e15d7))

.github/workflows/release.yml

@@ -28,12 +28,10 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: "lts/*"
-      - name: Make gradlew executable
-        run: chmod +x gradlew
       - name: Build with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew build
+        run: ./gradlew build clean
       - name: Setup semantic-release
         run: npm install -g semantic-release @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D
       - name: Release

.releaserc

@@ -20,6 +20,15 @@
         ]
       }
     ],
-    "@semantic-release/github"
+    [
+      "@semantic-release/github",
+      {
+        "assets": [
+          {
+            "path": "build/libs/*all.jar"
+          }
+        ]
+      }
+    ]
   ]
-}
+}

CHANGELOG.md

@@ -1,3 +1,60 @@
+## [1.4.4](https://github.com/revanced/revanced-cli/compare/v1.4.3...v1.4.4) (2022-06-18)
+
+
+### Bug Fixes
+
+* add execute permission to `./gradlew` file ([#36](https://github.com/revanced/revanced-cli/issues/36)) ([072d9e1](https://github.com/revanced/revanced-cli/commit/072d9e15d7e44b1080923f3afeb194eeb4fe4682))
+
+## [1.4.3](https://github.com/revanced/revanced-cli/compare/v1.4.2...v1.4.3) (2022-06-18)
+
+
+### Bug Fixes
+
+* update patcher to 1.2.5 ([055c282](https://github.com/revanced/revanced-cli/commit/055c282dd3d147e3600bdfdf4fd6b4bd72cbf379))
+
+## [1.4.2](https://github.com/revanced/revanced-cli/compare/v1.4.1...v1.4.2) (2022-06-16)
+
+
+### Bug Fixes
+
+* dummy publish task (1/2) [skip ci] ([afff4c8](https://github.com/revanced/revanced-cli/commit/afff4c8418bd33959440a3ac9e6c46816b3153ad))
+* releases (2/2) ([227d8d9](https://github.com/revanced/revanced-cli/commit/227d8d94c89ec24051bd5bc20808049164d92492))
+
+## [1.4.1](https://github.com/revanced/revanced-cli/compare/v1.4.0...v1.4.1) (2022-06-14)
+
+
+### Bug Fixes
+
+* move the keystore to the output directory ([6ceb449](https://github.com/revanced/revanced-cli/commit/6ceb449cf8539a92d89eeba8136fdc686319e2ef))
+
+# [1.4.0](https://github.com/revanced/revanced-cli/compare/v1.3.3...v1.4.0) (2022-06-14)
+
+
+### Features
+
+* chcon on mount ([e1c7d10](https://github.com/revanced/revanced-cli/commit/e1c7d1082a6946d1082c8744a1d0118c1a2263ea))
+
+## [1.3.3](https://github.com/revanced/revanced-cli/compare/v1.3.2...v1.3.3) (2022-06-13)
+
+
+### Bug Fixes
+
+* missing implementation ([48102c6](https://github.com/revanced/revanced-cli/commit/48102c66077c4ae17e3de1076e9da72de5f00366))
+
+## [1.3.2](https://github.com/revanced/revanced-cli/compare/v1.3.1...v1.3.2) (2022-06-13)
+
+
+### Bug Fixes
+
+* only upload `-all.jar` asset ([ca8e1ba](https://github.com/revanced/revanced-cli/commit/ca8e1ba6af00e275c6981476f773b13b103799d1))
+
+## [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,41 @@
 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("app.revanced:revanced-patcher:1.1.0")
-
+    implementation(kotlin("stdlib"))
+    implementation(kotlin("reflect"))
+    implementation("app.revanced:revanced-patcher:1.2.5")
     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()
 }
 
 tasks {
@@ -50,22 +49,12 @@ 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"])
-        }
+    // 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)
     }
 }

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 1.3.0
+version = 1.4.4

src/main/kotlin/app/revanced/cli/signing/Signing.kt

@@ -16,9 +16,10 @@ object Signing {
         // sign the alignedOutput and write to signedOutput
         // the reason is, in case the signer fails
         // it does not damage the output file
-        Signer(cn, password).signApk(alignedOutput, signedOutput)
+        val keyStore = Signer(cn, password).signApk(alignedOutput, signedOutput)
 
-        // afterwards copy over the file to the output
+        // afterwards copy over the file and the keystore to the output
         signedOutput.copyTo(outputFile, true)
+        keyStore.copyTo(outputFile.resolveSibling(keyStore.name), true)
     }
 }

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

@@ -54,6 +54,8 @@ internal object Constants {
             
             base_path="$PATH_REVANCED_APP"
             stock_path=${'$'}( pm path $PLACEHOLDER | grep base | sed 's/package://g' )
+
+            chcon u:object_r:apk_data_file:s0  ${'$'}base_path
             mount -o bind ${'$'}base_path ${'$'}stock_path
         """.trimIndent()
 }

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
                 }
             }

src/main/kotlin/app/revanced/utils/signing/Signer.kt

@@ -48,10 +48,11 @@ internal class Signer(
         return JcaX509CertificateConverter().getCertificate(builder.build(signer)) to pair.private
     }
 
-    fun signApk(input: File, output: File) {
+    fun signApk(input: File, output: File): File {
         Security.addProvider(BouncyCastleProvider())
 
-        val ks = File(input.parent, "revanced-cli.keystore")
+        // TODO: keystore should be saved securely
+        val ks = File(input.parent, "${output.nameWithoutExtension}.keystore")
         if (!ks.exists()) newKeystore(ks)
 
         val keyStore = KeyStore.getInstance("BKS", "BC")
@@ -70,5 +71,7 @@ internal class Signer(
         signer.setOutputApk(output)
 
         signer.build().sign()
+
+        return ks
     }
 }