Skip to content

Commit

Permalink
chore: update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
skylot committed Mar 16, 2024
1 parent eecdfae commit 49d2b34
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 13 deletions.
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23")
}

repositories {
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/jadx-java.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ dependencies {
implementation("org.slf4j:slf4j-api:2.0.12")
compileOnly("org.jetbrains:annotations:24.1.0")

testImplementation("ch.qos.logback:logback-classic:1.5.0")
testImplementation("ch.qos.logback:logback-classic:1.5.3")
testImplementation("org.hamcrest:hamcrest-library:2.2")
testImplementation("org.mockito:mockito-core:5.10.0")
testImplementation("org.mockito:mockito-core:5.11.0")
testImplementation("org.assertj:assertj-core:3.25.3")

testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
Expand Down
2 changes: 1 addition & 1 deletion jadx-cli/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies {
runtimeOnly(project(":jadx-plugins:jadx-xapk-input"))

implementation("org.jcommander:jcommander:1.83")
implementation("ch.qos.logback:logback-classic:1.5.0")
implementation("ch.qos.logback:logback-classic:1.5.3")
}

application {
Expand Down
8 changes: 6 additions & 2 deletions jadx-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,12 @@ dependencies {
implementation("com.google.code.gson:gson:2.10.1")

// TODO: move resources decoding to separate plugin module
implementation("com.android.tools.build:aapt2-proto:8.2.2-10154469")
implementation("com.google.protobuf:protobuf-java:3.25.3") // forcing latest version
implementation("com.android.tools.build:aapt2-proto:8.3.0-10880808")
implementation("com.google.protobuf:protobuf-java") {
version {
require("3.25.3") // version 4 conflict with `aapt2-proto`
}
}

testImplementation("org.apache.commons:commons-lang3:3.14.0")

Expand Down
8 changes: 4 additions & 4 deletions jadx-gui/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ dependencies {
implementation("com.fifesoft:autocomplete:3.3.1")

// use KtLint for format and check jadx scripts
implementation("com.pinterest.ktlint:ktlint-rule-engine:1.1.1")
implementation("com.pinterest.ktlint:ktlint-ruleset-standard:1.1.1")
implementation("com.pinterest.ktlint:ktlint-rule-engine:1.2.1")
implementation("com.pinterest.ktlint:ktlint-ruleset-standard:1.2.1")

implementation("org.jcommander:jcommander:1.83")
implementation("ch.qos.logback:logback-classic:1.5.0")
implementation("ch.qos.logback:logback-classic:1.5.3")
implementation("dev.dirs:directories:26")

implementation("com.fifesoft:rsyntaxtextarea:3.4.0")
Expand All @@ -43,7 +43,7 @@ dependencies {

implementation("io.reactivex.rxjava2:rxjava:2.2.21")
implementation("com.github.akarnokd:rxjava2-swing:0.3.7")
implementation("com.android.tools.build:apksig:8.2.2")
implementation("com.android.tools.build:apksig:8.3.0")
implementation("io.github.skylot:jdwp:2.0.0")

testImplementation(project(":jadx-core").dependencyProject.sourceSets.getByName("test").output)
Expand Down
2 changes: 1 addition & 1 deletion jadx-plugins/jadx-dex-input/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies {
implementation("com.android.tools.smali:smali-baksmali:3.0.5") {
exclude(group = "com.beust", module = "jcommander") // exclude old jcommander namespace
}
implementation("com.google.guava:guava:33.0.0-jre") // force the latest version for smali
implementation("com.google.guava:guava:33.1.0-jre") // force the latest version for smali

// compile smali files in tests
testImplementation("com.android.tools.smali:smali:3.0.5") {
Expand Down
2 changes: 1 addition & 1 deletion jadx-plugins/jadx-java-convert/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies {

implementation(project(":jadx-plugins:jadx-dex-input"))
implementation("com.jakewharton.android.repackaged:dalvik-dx:14.0.0_r21")
implementation("com.android.tools:r8:8.2.47")
implementation("com.android.tools:r8:8.3.37")

implementation("org.ow2.asm:asm:9.6")
}
2 changes: 1 addition & 1 deletion jadx-plugins/jadx-smali-input/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ dependencies {
implementation("com.android.tools.smali:smali:3.0.5") {
exclude(group = "com.beust", module = "jcommander") // exclude old jcommander namespace
}
implementation("com.google.guava:guava:33.0.0-jre") // force the latest version for smali
implementation("com.google.guava:guava:33.1.0-jre") // force the latest version for smali
}

0 comments on commit 49d2b34

Please sign in to comment.