Magic-Mirror/jadx
1
0
Fork 0
mirror of https://github.com/skylot/jadx.git synced 2024-10-07 01:53:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: update gradle and dependencies

Browse Source
This commit is contained in:
Skylot 2024-07-17 20:41:38 +01:00
parent ef79f266c8
commit ad4dd116be
No known key found for this signature in database
GPG Key ID: 47A4975761262B6A
17 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/build.gradle.kts
View File

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

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

@ -16,10 +16,10 @@ dependencies {
testImplementation("ch.qos.logback:logback-classic:1.5.6") testImplementation("ch.qos.logback:logback-classic:1.5.6")
testImplementation("org.hamcrest:hamcrest-library:2.2") testImplementation("org.hamcrest:hamcrest-library:2.2")
testImplementation("org.mockito:mockito-core:5.11.0") testImplementation("org.mockito:mockito-core:5.12.0")
testImplementation("org.assertj:assertj-core:3.25.3") testImplementation("org.assertj:assertj-core:3.26.3")
testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") testImplementation("org.junit.jupiter:junit-jupiter:5.10.3")
testRuntimeOnly("org.junit.platform:junit-platform-launcher") testRuntimeOnly("org.junit.platform:junit-platform-launcher")
testCompileOnly("org.jetbrains:annotations:24.1.0") testCompileOnly("org.jetbrains:annotations:24.1.0")

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

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

@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

7
gradlew vendored
View File

@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# SPDX-License-Identifier: Apache-2.0
#
############################################################################## ##############################################################################
# #
@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop. # Darwin, MinGW, and NonStop.
# #
# (3) This script is generated from the Groovy template # (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project. # within the Gradle project.
# #
# You can find Gradle at https://github.com/gradle/gradle/. # You can find Gradle at https://github.com/gradle/gradle/.
@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034 # shellcheck disable=SC2034
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum

2
gradlew.bat vendored
View File

@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and @rem See the License for the specific language governing permissions and
@rem limitations under the License. @rem limitations under the License.
@rem @rem
@rem SPDX-License-Identifier: Apache-2.0
@rem
@if "%DEBUG%"=="" @echo off @if "%DEBUG%"=="" @echo off
@rem ########################################################################## @rem ##########################################################################

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

@ -5,7 +5,7 @@ plugins {
dependencies { dependencies {
api(project(":jadx-plugins:jadx-input-api")) api(project(":jadx-plugins:jadx-input-api"))
implementation("com.google.code.gson:gson:2.10.1") implementation("com.google.code.gson:gson:2.11.0")
testImplementation("org.apache.commons:commons-lang3:3.14.0") testImplementation("org.apache.commons:commons-lang3:3.14.0")

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

@ -1,7 +1,7 @@
plugins { plugins {
id("jadx-kotlin") id("jadx-kotlin")
id("application") id("application")
id("edu.sc.seis.launch4j") version "3.0.5" id("edu.sc.seis.launch4j") version "3.0.6"
id("com.github.johnrengelman.shadow") version "8.1.1" id("com.github.johnrengelman.shadow") version "8.1.1"
id("org.beryx.runtime") version "1.13.1" id("org.beryx.runtime") version "1.13.1"
} }
@ -22,28 +22,28 @@ dependencies {
implementation("com.fifesoft:autocomplete:3.3.1") implementation("com.fifesoft:autocomplete:3.3.1")
// use KtLint for format and check jadx scripts // use KtLint for format and check jadx scripts
implementation("com.pinterest.ktlint:ktlint-rule-engine:1.2.1") implementation("com.pinterest.ktlint:ktlint-rule-engine:1.3.1")
implementation("com.pinterest.ktlint:ktlint-ruleset-standard:1.2.1") implementation("com.pinterest.ktlint:ktlint-ruleset-standard:1.3.1")
implementation("org.jcommander:jcommander:1.83") implementation("org.jcommander:jcommander:1.83")
implementation("ch.qos.logback:logback-classic:1.5.6") implementation("ch.qos.logback:logback-classic:1.5.6")
implementation("com.fifesoft:rsyntaxtextarea:3.4.0") implementation("com.fifesoft:rsyntaxtextarea:3.4.1")
implementation(files("libs/jfontchooser-1.0.5.jar")) implementation(files("libs/jfontchooser-1.0.5.jar"))
implementation("hu.kazocsaba:image-viewer:1.2.3") implementation("hu.kazocsaba:image-viewer:1.2.3")
implementation("com.formdev:flatlaf:3.4.1") implementation("com.formdev:flatlaf:3.5")
implementation("com.formdev:flatlaf-intellij-themes:3.4.1") implementation("com.formdev:flatlaf-intellij-themes:3.5")
implementation("com.formdev:flatlaf-extras:3.4.1") implementation("com.formdev:flatlaf-extras:3.5")
implementation("com.google.code.gson:gson:2.10.1") implementation("com.google.code.gson:gson:2.11.0")
implementation("org.apache.commons:commons-lang3:3.14.0") implementation("org.apache.commons:commons-lang3:3.14.0")
implementation("org.apache.commons:commons-text:1.12.0") implementation("org.apache.commons:commons-text:1.12.0")
implementation("commons-io:commons-io:2.16.1") implementation("commons-io:commons-io:2.16.1")
implementation("io.reactivex.rxjava2:rxjava:2.2.21") implementation("io.reactivex.rxjava2:rxjava:2.2.21")
implementation("com.github.akarnokd:rxjava2-swing:0.3.7") implementation("com.github.akarnokd:rxjava2-swing:0.3.7")
implementation("com.android.tools.build:apksig:8.3.2") implementation("com.android.tools.build:apksig:8.5.1")
implementation("io.github.skylot:jdwp:2.0.0") implementation("io.github.skylot:jdwp:2.0.0")
testImplementation(project(":jadx-core").dependencyProject.sourceSets.getByName("test").output) testImplementation(project(":jadx-core").dependencyProject.sourceSets.getByName("test").output)

2
jadx-plugins-tools/build.gradle.kts
View File

@ -7,5 +7,5 @@ dependencies {
implementation(project(":jadx-commons:jadx-app-commons")) implementation(project(":jadx-commons:jadx-app-commons"))
implementation("com.google.code.gson:gson:2.10.1") implementation("com.google.code.gson:gson:2.11.0")
} }

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

@ -5,14 +5,14 @@ plugins {
dependencies { dependencies {
compileOnly(project(":jadx-core")) compileOnly(project(":jadx-core"))
implementation("com.android.tools.build:aapt2-proto:8.3.2-10880808") implementation("com.android.tools.build:aapt2-proto:8.5.1-11315950")
implementation("com.google.protobuf:protobuf-java") { implementation("com.google.protobuf:protobuf-java") {
version { version {
require("3.25.3") // version 4 conflict with `aapt2-proto` require("3.25.3") // version 4 conflict with `aapt2-proto`
} }
} }
implementation("com.android.tools.build:bundletool:1.15.6") { implementation("com.android.tools.build:bundletool:1.17.0") {
// All of this is unnecessary for parsing BundleConfig.pb except for protobuf // All of this is unnecessary for parsing BundleConfig.pb except for protobuf
exclude(group = "com.android.tools.build") exclude(group = "com.android.tools.build")
exclude(group = "com.google.protobuf") exclude(group = "com.google.protobuf")

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

@ -6,13 +6,13 @@ dependencies {
api(project(":jadx-core")) api(project(":jadx-core"))
// TODO: finish own smali printer // TODO: finish own smali printer
implementation("com.android.tools.smali:smali-baksmali:3.0.5") { implementation("com.android.tools.smali:smali-baksmali:3.0.7") {
exclude(group = "com.beust", module = "jcommander") // exclude old jcommander namespace exclude(group = "com.beust", module = "jcommander") // exclude old jcommander namespace
} }
implementation("com.google.guava:guava:33.1.0-jre") // force the latest version for smali implementation("com.google.guava:guava:33.2.1-jre") // force the latest version for smali
// compile smali files in tests // compile smali files in tests
testImplementation("com.android.tools.smali:smali:3.0.5") { testImplementation("com.android.tools.smali:smali:3.0.7") {
exclude(group = "com.beust", module = "jcommander") // exclude old jcommander namespace exclude(group = "com.beust", module = "jcommander") // exclude old jcommander namespace
} }
} }

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

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

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

@ -11,6 +11,6 @@ dependencies {
implementation(kotlin("scripting-compiler-embeddable")) implementation(kotlin("scripting-compiler-embeddable"))
implementation(kotlin("scripting-ide-services")) implementation(kotlin("scripting-ide-services"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
implementation("io.github.oshai:kotlin-logging-jvm:6.0.9") implementation("io.github.oshai:kotlin-logging-jvm:7.0.0")
} }

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

@ -11,7 +11,7 @@ dependencies {
implementation(kotlin("scripting-jvm")) implementation(kotlin("scripting-jvm"))
implementation(kotlin("scripting-jvm-host")) implementation(kotlin("scripting-jvm-host"))
implementation("io.github.oshai:kotlin-logging-jvm:6.0.9") implementation("io.github.oshai:kotlin-logging-jvm:7.0.0")
testImplementation(project(":jadx-core")) testImplementation(project(":jadx-core"))
} }

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

@ -14,8 +14,8 @@ dependencies {
implementation(kotlin("scripting-dependencies")) implementation(kotlin("scripting-dependencies"))
implementation(kotlin("scripting-dependencies-maven")) implementation(kotlin("scripting-dependencies-maven"))
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
implementation("io.github.oshai:kotlin-logging-jvm:6.0.9") implementation("io.github.oshai:kotlin-logging-jvm:7.0.0")
runtimeOnly(project(":jadx-plugins:jadx-dex-input")) runtimeOnly(project(":jadx-plugins:jadx-dex-input"))
runtimeOnly(project(":jadx-plugins:jadx-smali-input")) runtimeOnly(project(":jadx-plugins:jadx-smali-input"))

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

@ -7,8 +7,8 @@ dependencies {
implementation(project(":jadx-plugins:jadx-dex-input")) implementation(project(":jadx-plugins:jadx-dex-input"))
implementation("com.android.tools.smali:smali:3.0.5") { implementation("com.android.tools.smali:smali:3.0.7") {
exclude(group = "com.beust", module = "jcommander") // exclude old jcommander namespace exclude(group = "com.beust", module = "jcommander") // exclude old jcommander namespace
} }
implementation("com.google.guava:guava:33.1.0-jre") // force the latest version for smali implementation("com.google.guava:guava:33.2.1-jre") // force the latest version for smali
} }

2
jadx-plugins/jadx-xapk-input/build.gradle.kts
View File

@ -7,5 +7,5 @@ dependencies {
api(project(":jadx-core")) api(project(":jadx-core"))
implementation(project(":jadx-plugins:jadx-dex-input")) implementation(project(":jadx-plugins:jadx-dex-input"))
implementation("com.google.code.gson:gson:2.10.1") implementation("com.google.code.gson:gson:2.11.0")
} }