Skip to content

Commit

Permalink
chore: merge branch dev to main (ReVanced#194)
Browse files Browse the repository at this point in the history
  • Loading branch information
oSumAtrIX authored Jan 15, 2023
2 parents f99d340 + 9888b0e commit 567bdee
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 3 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# [2.20.0-dev.3](https://github.com/revanced/revanced-cli/compare/v2.20.0-dev.2...v2.20.0-dev.3) (2023-01-15)


### Bug Fixes

* bump patcher dependency version ([51c04b7](https://github.com/revanced/revanced-cli/commit/51c04b7b162ad2876bbeb248b7ccddd105b5076d))

# [2.20.0-dev.2](https://github.com/revanced/revanced-cli/compare/v2.20.0-dev.1...v2.20.0-dev.2) (2023-01-15)


### Features

* connect to first device if given device was not found ([6485e47](https://github.com/revanced/revanced-cli/commit/6485e477a10bb89dfb2e40f3596d72b20bf23cc8))

# [2.20.0](https://github.com/revanced/revanced-cli/compare/v2.19.0...v2.20.0) (2023-01-02)


Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ repositories {
dependencies {
implementation(kotlin("reflect"))

implementation("app.revanced:revanced-patcher:6.4.0")
implementation("app.revanced:revanced-patcher:6.4.1")
implementation("info.picocli:picocli:4.7.0")
implementation("com.github.revanced:jadb:master-SNAPSHOT") // updated fork
implementation("com.android.tools.build:apksig:7.2.1")
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
kotlin.code.style = official
version = 2.20.0
version = 2.20.0-dev.3
2 changes: 1 addition & 1 deletion src/main/kotlin/app/revanced/utils/adb/Adb.kt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ internal class Adb(
private val device: JadbDevice

init {
device = JadbConnection().devices.find { it.serial == deviceName }
device = JadbConnection().devices.let { device -> device.find { it.serial == deviceName } ?: device.first() }
?: throw IllegalArgumentException("No such device with name $deviceName")

if (!modeInstall && device.run("su -h", false) != 0)
Expand Down

0 comments on commit 567bdee

Please sign in to comment.