Magic-Mirror/jadx
1
0
Fork 0
mirror of https://github.com/skylot/jadx.git synced 2024-11-23 04:39:46 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

chore: update gradle and dependencies

Browse Source
This commit is contained in:
Skylot 2023-12-04 20:18:28 +00:00
parent e06e6bd483
commit 2de91f9a3a
No known key found for this signature in database
GPG Key ID: 47866607B16F25C8
17 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@ -6,9 +6,9 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
import java.util.Locale
plugins {
id("com.github.ben-manes.versions") version "0.49.0"
id("com.github.ben-manes.versions") version "0.50.0"
id("se.patrikerdes.use-latest-versions") version "0.2.18"
id("com.diffplug.spotless") version "6.22.0"
id("com.diffplug.spotless") version "6.23.3"
}
val jadxVersion by extra { System.getenv("JADX_VERSION") ?: "dev" }

2
buildSrc/build.gradle.kts
View File

@ -3,7 +3,7 @@ plugins {
}
dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21")
}
repositories {

4
buildSrc/src/main/kotlin/jadx-java.gradle.kts
View File

@ -14,9 +14,9 @@ dependencies {
implementation("org.slf4j:slf4j-api:2.0.9")
compileOnly("org.jetbrains:annotations:24.1.0")
testImplementation("ch.qos.logback:logback-classic:1.4.11")
testImplementation("ch.qos.logback:logback-classic:1.4.14")
testImplementation("org.hamcrest:hamcrest-library:2.2")
testImplementation("org.mockito:mockito-core:5.7.0")
testImplementation("org.mockito:mockito-core:5.8.0")
testImplementation("org.assertj:assertj-core:3.24.2")
testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

14
gradlew vendored
View File

@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@ -202,11 +202,11 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \

4
jadx-cli/build.gradle.kts
View File

@ -18,8 +18,8 @@ dependencies {
runtimeOnly(project(":jadx-plugins:jadx-kotlin-metadata"))
runtimeOnly(project(":jadx-plugins:jadx-script:jadx-script-plugin"))
implementation("com.beust:jcommander:1.82")
implementation("ch.qos.logback:logback-classic:1.4.11")
implementation("org.jcommander:jcommander:1.83")
implementation("ch.qos.logback:logback-classic:1.4.14")
}
application {

4
jadx-core/build.gradle.kts
View File

@ -8,10 +8,10 @@ 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.1.3-10154469")
implementation("com.android.tools.build:aapt2-proto:8.2.0-10154469")
implementation("com.google.protobuf:protobuf-java:3.25.1") // forcing latest version
testImplementation("org.apache.commons:commons-lang3:3.13.0")
testImplementation("org.apache.commons:commons-lang3:3.14.0")
testImplementation(project(":jadx-plugins:jadx-dex-input"))
testRuntimeOnly(project(":jadx-plugins:jadx-smali-input"))

10
jadx-gui/build.gradle.kts
View File

@ -24,8 +24,8 @@ dependencies {
implementation("com.pinterest.ktlint:ktlint-rule-engine:1.0.1")
implementation("com.pinterest.ktlint:ktlint-ruleset-standard:1.0.1")
implementation("com.beust:jcommander:1.82")
implementation("ch.qos.logback:logback-classic:1.4.11")
implementation("org.jcommander:jcommander:1.83")
implementation("ch.qos.logback:logback-classic:1.4.14")
implementation("dev.dirs:directories:26")
implementation("com.fifesoft:rsyntaxtextarea:3.3.4")
@ -37,13 +37,13 @@ dependencies {
implementation("com.formdev:flatlaf-extras:3.2.5")
implementation("com.google.code.gson:gson:2.10.1")
implementation("org.apache.commons:commons-lang3:3.13.0")
implementation("org.apache.commons:commons-lang3:3.14.0")
implementation("org.apache.commons:commons-text:1.11.0")
implementation("commons-io:commons-io:2.15.0")
implementation("commons-io:commons-io:2.15.1")
implementation("io.reactivex.rxjava2:rxjava:2.2.21")
implementation("com.github.akarnokd:rxjava2-swing:0.3.7")
implementation("com.android.tools.build:apksig:8.1.3")
implementation("com.android.tools.build:apksig:8.2.0")
implementation("io.github.skylot:jdwp:2.0.0")
testImplementation(project(":jadx-core").dependencyProject.sourceSets.getByName("test").output)

8
jadx-plugins/jadx-dex-input/build.gradle.kts
View File

@ -6,15 +6,17 @@ dependencies {
api(project(":jadx-core"))
// TODO: finish own smali printer
implementation("org.smali:baksmali:2.5.2")
// force latest version for smali
implementation("org.smali:baksmali:2.5.2") {
exclude(group = "com.beust", module = "jcommander") // exclude old jcommander namespace
}
// force the latest version for smali
constraints {
implementation("com.google.guava:guava:30.1.1-jre")
implementation("com.beust:jcommander:1.81")
}
// compile smali files in tests
testImplementation("org.smali:smali:2.5.2") {
exclude(group = "junit", module = "junit") // ignore junit 4 transitive dependency
exclude(group = "com.beust", module = "jcommander") // exclude old jcommander namespace
}
}

2
jadx-plugins/jadx-java-convert/build.gradle.kts
View File

@ -7,7 +7,7 @@ dependencies {
implementation(project(":jadx-plugins:jadx-dex-input"))
implementation("com.jakewharton.android.repackaged:dalvik-dx:11.0.0_r3")
implementation("com.android.tools:r8:8.1.56")
implementation("com.android.tools:r8:8.1.72")
implementation("org.ow2.asm:asm:9.6")
}

2
jadx-plugins/jadx-kotlin-metadata/build.gradle.kts
View File

@ -9,7 +9,7 @@ dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.7.0")
testImplementation(project(":jadx-core").dependencyProject.sourceSets.test.get().output)
testImplementation("org.apache.commons:commons-lang3:3.13.0")
testImplementation("org.apache.commons:commons-lang3:3.14.0")
testRuntimeOnly(project(":jadx-plugins:jadx-smali-input"))
}

2
jadx-plugins/jadx-rename-mappings/build.gradle.kts
View File

@ -6,7 +6,7 @@ plugins {
dependencies {
api(project(":jadx-core"))
api("net.fabricmc:mapping-io:0.5.0") {
api("net.fabricmc:mapping-io:0.5.1") {
exclude("org.ow2.asm:asm")
exclude("net.fabricmc:tiny-remapper")
}

2
jadx-plugins/jadx-script/examples/build.gradle.kts
View File

@ -8,7 +8,7 @@ dependencies {
implementation(kotlin("stdlib-common"))
implementation(kotlin("script-runtime"))
implementation("io.github.oshai:kotlin-logging-jvm:5.1.0")
implementation("io.github.oshai:kotlin-logging-jvm:5.1.1")
// script context support in IDE is poor, use stubs and manual imports for now
// kotlinScriptDef(project(":jadx-plugins:jadx-script:jadx-script-runtime"))

2
jadx-plugins/jadx-script/jadx-script-ide/build.gradle.kts
View File

@ -12,5 +12,5 @@ dependencies {
implementation(kotlin("scripting-ide-services"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
implementation("io.github.oshai:kotlin-logging-jvm:5.1.0")
implementation("io.github.oshai:kotlin-logging-jvm:5.1.1")
}

2
jadx-plugins/jadx-script/jadx-script-plugin/build.gradle.kts
View File

@ -10,7 +10,7 @@ dependencies {
implementation(kotlin("scripting-jvm"))
implementation(kotlin("scripting-jvm-host"))
implementation("io.github.oshai:kotlin-logging-jvm:5.1.0")
implementation("io.github.oshai:kotlin-logging-jvm:5.1.1")
// path for scripts cache
implementation("dev.dirs:directories:26")

2
jadx-plugins/jadx-script/jadx-script-runtime/build.gradle.kts
View File

@ -15,7 +15,7 @@ dependencies {
implementation(kotlin("scripting-dependencies-maven"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
implementation("io.github.oshai:kotlin-logging-jvm:5.1.0")
implementation("io.github.oshai:kotlin-logging-jvm:5.1.1")
runtimeOnly(project(":jadx-plugins:jadx-dex-input"))
runtimeOnly(project(":jadx-plugins:jadx-smali-input"))

4
jadx-plugins/jadx-smali-input/build.gradle.kts
View File

@ -9,10 +9,10 @@ dependencies {
implementation("org.smali:smali:2.5.2") {
exclude(group = "junit", module = "junit") // ignore junit 4 transitive dependency
exclude(group = "com.beust", module = "jcommander") // exclude old jcommander namespace
}
// force latest version for smali
// force the latest version for smali
constraints {
implementation("com.google.guava:guava:30.1.1-jre")
implementation("com.beust:jcommander:1.81")
}
}