chore: update gradle and dependencies

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

View File

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

View File

@ -16,10 +16,10 @@ dependencies {
testImplementation("ch.qos.logback:logback-classic:1.5.6")
testImplementation("org.hamcrest:hamcrest-library:2.2")
testImplementation("org.mockito:mockito-core:5.11.0")
testImplementation("org.assertj:assertj-core:3.25.3")
testImplementation("org.mockito:mockito-core:5.12.0")
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")
testCompileOnly("org.jetbrains:annotations:24.1.0")

Binary file not shown.

View File

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

7
gradlew vendored
View File

@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#
##############################################################################
#
@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (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.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# 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.
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 limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################

View File

@ -5,7 +5,7 @@ plugins {
dependencies {
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")

View File

@ -1,7 +1,7 @@
plugins {
id("jadx-kotlin")
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("org.beryx.runtime") version "1.13.1"
}
@ -22,28 +22,28 @@ dependencies {
implementation("com.fifesoft:autocomplete:3.3.1")
// use KtLint for format and check jadx scripts
implementation("com.pinterest.ktlint:ktlint-rule-engine:1.2.1")
implementation("com.pinterest.ktlint:ktlint-ruleset-standard:1.2.1")
implementation("com.pinterest.ktlint:ktlint-rule-engine:1.3.1")
implementation("com.pinterest.ktlint:ktlint-ruleset-standard:1.3.1")
implementation("org.jcommander:jcommander:1.83")
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("hu.kazocsaba:image-viewer:1.2.3")
implementation("com.formdev:flatlaf:3.4.1")
implementation("com.formdev:flatlaf-intellij-themes:3.4.1")
implementation("com.formdev:flatlaf-extras:3.4.1")
implementation("com.formdev:flatlaf:3.5")
implementation("com.formdev:flatlaf-intellij-themes:3.5")
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-text:1.12.0")
implementation("commons-io:commons-io:2.16.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.3.2")
implementation("com.android.tools.build:apksig:8.5.1")
implementation("io.github.skylot:jdwp:2.0.0")
testImplementation(project(":jadx-core").dependencyProject.sourceSets.getByName("test").output)

View File

@ -7,5 +7,5 @@ dependencies {
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")
}

View File

@ -5,14 +5,14 @@ plugins {
dependencies {
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") {
version {
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
exclude(group = "com.android.tools.build")
exclude(group = "com.google.protobuf")

View File

@ -6,13 +6,13 @@ dependencies {
api(project(":jadx-core"))
// 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
}
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
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
}
}

View File

@ -8,7 +8,7 @@ dependencies {
implementation(kotlin("stdlib-common"))
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
// kotlinScriptDef(project(":jadx-plugins:jadx-script:jadx-script-runtime"))

View File

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

View File

@ -11,7 +11,7 @@ dependencies {
implementation(kotlin("scripting-jvm"))
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"))
}

View File

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

View File

@ -7,8 +7,8 @@ dependencies {
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
}
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
}

View File

@ -7,5 +7,5 @@ dependencies {
api(project(":jadx-core"))
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")
}