chore(release): 1.1.4-dev.2 [skip ci]

## [1.1.4-dev.2](https://github.com/ReVanced/revanced-library/compare/v1.1.4-dev.1...v1.1.4-dev.2) (2023-10-10)

### Bug Fixes

* Ask for root permissions before trying to use them ([aea1d69](aea1d69157))

CHANGELOG.md

@@ -1,3 +1,25 @@
+## [1.1.4-dev.2](https://github.com/ReVanced/revanced-library/compare/v1.1.4-dev.1...v1.1.4-dev.2) (2023-10-10)
+
+
+### Bug Fixes
+
+* Ask for root permissions before trying to use them ([aea1d69](https://github.com/ReVanced/revanced-library/commit/aea1d6915766d9757075ee459955aa335d906bab))
+
+## [1.1.4-dev.1](https://github.com/ReVanced/revanced-library/compare/v1.1.3...v1.1.4-dev.1) (2023-10-09)
+
+
+### Bug Fixes
+
+* Execute ADB commands sequentially to fix mounting issues ([#12](https://github.com/ReVanced/revanced-library/issues/12)) ([fda3eca](https://github.com/ReVanced/revanced-library/commit/fda3eca74f30b968d8ee816d63a3dcf493e026de))
+
+## [1.1.3](https://github.com/ReVanced/revanced-library/compare/v1.1.2...v1.1.3) (2023-10-09)
+
+## [1.1.3-dev.2](https://github.com/ReVanced/revanced-library/compare/v1.1.3-dev.1...v1.1.3-dev.2) (2023-10-09)
+
+## [1.1.3-dev.1](https://github.com/ReVanced/revanced-library/compare/v1.1.2...v1.1.3-dev.1) (2023-10-09)
+
+## [1.1.2](https://github.com/ReVanced/revanced-library/compare/v1.1.1...v1.1.2) (2023-10-05)
+
 ## [1.1.2-dev.1](https://github.com/ReVanced/revanced-library/compare/v1.1.1...v1.1.2-dev.1) (2023-10-05)
 
 ## [1.1.1](https://github.com/ReVanced/revanced-library/compare/v1.1.0...v1.1.1) (2023-10-04)

build.gradle.kts

@@ -34,17 +34,6 @@ java {
 }
 
 publishing {
-    repositories {
-        mavenLocal()
-        maven {
-            name = "GitHubPackages"
-            url = uri("https://maven.pkg.github.com/revanced/revanced-library")
-            credentials {
-                username = System.getenv("GITHUB_ACTOR")
-                password = System.getenv("GITHUB_TOKEN")
-            }
-        }
-    }
     publications {
         create<MavenPublication>("gpr") {
             from(components["java"])

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 1.1.2-dev.1
+version = 1.1.4-dev.2

gradle/libs.versions.toml

@@ -1,21 +1,21 @@
 [versions]
-apksig = "8.1.1"
+apksig = "8.1.2"
 bcpkix-jdk18on = "1.76"
 jackson-module-kotlin = "2.14.3"
-jadb = "2531a28109"
+jadb = "1.2.1"
 kotlin-reflect = "1.9.0"
 kotlin-test = "1.8.20-RC"
-revanced-patcher = "16.0.1"
+revanced-patcher = "17.0.0"
 binary-compatibility-validator = "0.13.2"
 
 [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 = "com.github.revanced:jadb", version.ref = "jadb" }
+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" }
-revanced-patcher = { module = "app.revanced:revanced-patcher", version.ref = "revanced-patcher" }
+revanced-patcher = { module = "app.revanced.revanced-patcher:revanced-patcher", version.ref = "revanced-patcher" }
 
 [plugins]
 binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility-validator" }

settings.gradle.kts

@@ -1,22 +1,9 @@
-val githubUsername: String = providers.gradleProperty("gpr.user").orNull ?: System.getenv("GITHUB_ACTOR")
-val githubPassword: String = providers.gradleProperty("gpr.key").orNull ?: System.getenv("GITHUB_TOKEN")
-
 dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
         mavenCentral()
         mavenLocal()
-        google()
         maven { url = uri("https://jitpack.io") }
-        listOf("revanced-patcher", "jadb").forEach { repo ->
+        google()
-            maven {
-                url = uri("https://maven.pkg.github.com/revanced/$repo")
-                credentials {
-                    username = githubUsername
-                    password = githubPassword
-                }
-            }
-        }
     }
 }
 

src/main/kotlin/app/revanced/library/adb/AdbManager.kt

@@ -84,14 +84,14 @@ sealed class AdbManager private constructor(deviceSerial: String? = null) {
 
             device.push(apk.file, TMP_PATH)
 
-            device.run("$CREATE_DIR $INSTALLATION_PATH")
+            device.run("$CREATE_DIR $INSTALLATION_PATH").waitFor()
-            device.run(INSTALL_PATCHED_APK, packageName)
+            device.run(INSTALL_PATCHED_APK, packageName).waitFor()
 
             device.createFile(TMP_PATH, MOUNT_SCRIPT.applyReplacement(packageName))
 
-            device.run(INSTALL_MOUNT, packageName)
+            device.run(INSTALL_MOUNT, packageName).waitFor()
-            device.run(UMOUNT, packageName) // Sanity check.
+            device.run(UMOUNT, packageName).waitFor() // Sanity check.
-            device.run(MOUNT_PATH, packageName)
+            device.run(MOUNT_PATH, packageName).waitFor()
             device.run(RESTART, packageName)
             device.run(DELETE, TMP_PATH)
 

src/main/kotlin/app/revanced/library/adb/Commands.kt

@@ -2,7 +2,6 @@ package app.revanced.library.adb
 
 import se.vidstige.jadb.JadbDevice
 import se.vidstige.jadb.RemoteFile
-import se.vidstige.jadb.ShellProcess
 import se.vidstige.jadb.ShellProcessBuilder
 import java.io.File
 
@@ -16,19 +15,14 @@ internal fun JadbDevice.buildCommand(command: String, su: Boolean = true): Shell
     return shellProcessBuilder(cmd, *args.toTypedArray())
 }
 
-internal fun JadbDevice.run(command: String, su: Boolean = true): ShellProcess {
+internal fun JadbDevice.run(command: String, su: Boolean = true) =
-    return this.buildCommand(command, su).start()!!
+    this.buildCommand(command, su).start()
-}
 
 internal fun JadbDevice.hasSu() =
-    this.startCommand("su -h", false).waitFor() == 0
+    this.run("whoami", true).waitFor() == 0
 
 internal fun JadbDevice.push(file: File, targetFilePath: String) =
     push(file, RemoteFile(targetFilePath))
 
 internal fun JadbDevice.createFile(targetFile: String, content: String) =
     push(content.byteInputStream(), System.currentTimeMillis(), 644, RemoteFile(targetFile))
-
-
-private fun JadbDevice.startCommand(command: String, su: Boolean) =
-    shellProcessBuilder(if (su) "su -c '$command'" else command).start()