chore: update gradle and dependencies
This commit is contained in:
+1
-1
@@ -7,7 +7,7 @@ import java.util.Locale
|
|||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id("com.github.ben-manes.versions") version "0.52.0"
|
id("com.github.ben-manes.versions") version "0.52.0"
|
||||||
id("se.patrikerdes.use-latest-versions") version "0.2.18"
|
id("se.patrikerdes.use-latest-versions") version "0.2.19"
|
||||||
id("com.diffplug.spotless") version "6.25.0"
|
id("com.diffplug.spotless") version "6.25.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0")
|
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.20")
|
||||||
|
|
||||||
implementation("org.openrewrite:plugin:6.19.1")
|
implementation("org.openrewrite:plugin:6.19.1")
|
||||||
}
|
}
|
||||||
|
|||||||
Vendored
BIN
Binary file not shown.
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
|
distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright © 2015-2021 the original authors.
|
# Copyright © 2015 the original authors.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
@@ -114,7 +114,6 @@ case "$( uname )" in #(
|
|||||||
NONSTOP* ) nonstop=true ;;
|
NONSTOP* ) nonstop=true ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
CLASSPATH="\\\"\\\""
|
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
# Determine the Java command to use to start the JVM.
|
||||||
@@ -172,7 +171,6 @@ fi
|
|||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
if "$cygwin" || "$msys" ; then
|
if "$cygwin" || "$msys" ; then
|
||||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
|
||||||
|
|
||||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||||
|
|
||||||
@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|||||||
|
|
||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
-classpath "$CLASSPATH" \
|
|
||||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||||
"$@"
|
"$@"
|
||||||
|
|
||||||
|
|||||||
Vendored
+1
-2
@@ -70,11 +70,10 @@ goto fail
|
|||||||
:execute
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
set CLASSPATH=
|
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
@rem Execute Gradle
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||||
|
|
||||||
:end
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ dependencies {
|
|||||||
api(project(":jadx-plugins:jadx-input-api"))
|
api(project(":jadx-plugins:jadx-input-api"))
|
||||||
api(project(":jadx-commons:jadx-zip"))
|
api(project(":jadx-commons:jadx-zip"))
|
||||||
|
|
||||||
implementation("com.google.code.gson:gson:2.13.1")
|
implementation("com.google.code.gson:gson:2.13.2")
|
||||||
|
|
||||||
testImplementation("org.apache.commons:commons-lang3:3.18.0")
|
testImplementation("org.apache.commons:commons-lang3:3.18.0")
|
||||||
|
|
||||||
@@ -22,7 +22,7 @@ dependencies {
|
|||||||
strictly("[3.33, 3.34[") // from 3.34 compiled with Java 17
|
strictly("[3.33, 3.34[") // from 3.34 compiled with Java 17
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
testImplementation("tools.profiler:async-profiler:4.0")
|
testImplementation("tools.profiler:async-profiler:4.1")
|
||||||
}
|
}
|
||||||
|
|
||||||
val jadxTestJavaVersion = getTestJavaVersion()
|
val jadxTestJavaVersion = getTestJavaVersion()
|
||||||
|
|||||||
@@ -2,8 +2,8 @@ plugins {
|
|||||||
id("jadx-kotlin")
|
id("jadx-kotlin")
|
||||||
id("application")
|
id("application")
|
||||||
id("jadx-library")
|
id("jadx-library")
|
||||||
id("edu.sc.seis.launch4j") version "3.0.6"
|
|
||||||
id("com.gradleup.shadow") version "8.3.8"
|
id("com.gradleup.shadow") version "8.3.8"
|
||||||
|
id("edu.sc.seis.launch4j") version "4.0.0"
|
||||||
id("org.beryx.runtime") version "1.13.1"
|
id("org.beryx.runtime") version "1.13.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -23,12 +23,12 @@ dependencies {
|
|||||||
implementation("com.fifesoft:autocomplete:3.3.2")
|
implementation("com.fifesoft:autocomplete:3.3.2")
|
||||||
|
|
||||||
// use KtLint for format and check jadx scripts
|
// use KtLint for format and check jadx scripts
|
||||||
implementation("com.pinterest.ktlint:ktlint-rule-engine:1.7.0")
|
implementation("com.pinterest.ktlint:ktlint-rule-engine:1.7.1")
|
||||||
implementation("com.pinterest.ktlint:ktlint-ruleset-standard:1.7.0")
|
implementation("com.pinterest.ktlint:ktlint-ruleset-standard:1.7.1")
|
||||||
|
|
||||||
implementation("org.jcommander:jcommander:2.0")
|
implementation("org.jcommander:jcommander:2.0")
|
||||||
implementation("ch.qos.logback:logback-classic:1.5.18")
|
implementation("ch.qos.logback:logback-classic:1.5.18")
|
||||||
implementation("io.github.oshai:kotlin-logging-jvm:7.0.7")
|
implementation("io.github.oshai:kotlin-logging-jvm:7.0.13")
|
||||||
|
|
||||||
implementation("com.fifesoft:rsyntaxtextarea:3.6.0")
|
implementation("com.fifesoft:rsyntaxtextarea:3.6.0")
|
||||||
implementation("org.drjekyll:fontchooser:3.1.0")
|
implementation("org.drjekyll:fontchooser:3.1.0")
|
||||||
@@ -39,14 +39,14 @@ dependencies {
|
|||||||
implementation("com.formdev:flatlaf-intellij-themes:3.6.1")
|
implementation("com.formdev:flatlaf-intellij-themes:3.6.1")
|
||||||
implementation("com.formdev:flatlaf-extras:3.6.1")
|
implementation("com.formdev:flatlaf-extras:3.6.1")
|
||||||
|
|
||||||
implementation("com.google.code.gson:gson:2.13.1")
|
implementation("com.google.code.gson:gson:2.13.2")
|
||||||
implementation("org.apache.commons:commons-lang3:3.18.0")
|
implementation("org.apache.commons:commons-lang3:3.18.0")
|
||||||
implementation("org.apache.commons:commons-text:1.13.1")
|
implementation("org.apache.commons:commons-text:1.14.0")
|
||||||
implementation("commons-io:commons-io:2.20.0")
|
implementation("commons-io:commons-io:2.20.0")
|
||||||
|
|
||||||
implementation("io.reactivex.rxjava3:rxjava:3.1.11")
|
implementation("io.reactivex.rxjava3:rxjava:3.1.11")
|
||||||
implementation("com.github.akarnokd:rxjava3-swing:3.1.1")
|
implementation("com.github.akarnokd:rxjava3-swing:3.1.1")
|
||||||
implementation("com.android.tools.build:apksig:8.11.1")
|
implementation("com.android.tools.build:apksig:8.13.0")
|
||||||
implementation("io.github.skylot:jdwp:2.0.0")
|
implementation("io.github.skylot:jdwp:2.0.0")
|
||||||
|
|
||||||
// Library for hex viewing data
|
// Library for hex viewing data
|
||||||
|
|||||||
@@ -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.13.1")
|
implementation("com.google.code.gson:gson:2.13.2")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ plugins {
|
|||||||
dependencies {
|
dependencies {
|
||||||
compileOnly(project(":jadx-core"))
|
compileOnly(project(":jadx-core"))
|
||||||
|
|
||||||
implementation("com.android.tools.build:aapt2-proto:8.11.1-12782657")
|
implementation("com.android.tools.build:aapt2-proto:8.13.0-13719691")
|
||||||
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`
|
||||||
|
|||||||
@@ -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.13.1")
|
implementation("com.google.code.gson:gson:2.13.2")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ dependencies {
|
|||||||
implementation("com.android.tools.smali:smali-baksmali:3.0.9") {
|
implementation("com.android.tools.smali:smali-baksmali:3.0.9") {
|
||||||
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.4.8-jre") // force the latest version for smali
|
implementation("com.google.guava:guava:33.5.0-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.9") {
|
testImplementation("com.android.tools.smali:smali:3.0.9") {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ dependencies {
|
|||||||
|
|
||||||
implementation(project(":jadx-plugins:jadx-dex-input"))
|
implementation(project(":jadx-plugins:jadx-dex-input"))
|
||||||
implementation("com.jakewharton.android.repackaged:dalvik-dx:14.0.0_r21")
|
implementation("com.jakewharton.android.repackaged:dalvik-dx:14.0.0_r21")
|
||||||
implementation("com.android.tools:r8:8.9.35")
|
implementation("com.android.tools:r8:8.11.18")
|
||||||
|
|
||||||
implementation("org.ow2.asm:asm:9.8")
|
implementation("org.ow2.asm:asm:9.8")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,14 +8,14 @@ dependencies {
|
|||||||
implementation(kotlin("stdlib-common"))
|
implementation(kotlin("stdlib-common"))
|
||||||
implementation(kotlin("script-runtime"))
|
implementation(kotlin("script-runtime"))
|
||||||
|
|
||||||
implementation("io.github.oshai:kotlin-logging-jvm:7.0.7")
|
implementation("io.github.oshai:kotlin-logging-jvm:7.0.13")
|
||||||
|
|
||||||
// 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"))
|
||||||
|
|
||||||
// manual imports (IDE can't import dependencies by scripts annotations)
|
// manual imports (IDE can't import dependencies by scripts annotations)
|
||||||
implementation("com.github.javafaker:javafaker:1.0.2")
|
implementation("com.github.javafaker:javafaker:1.0.2")
|
||||||
implementation("org.apache.commons:commons-text:1.13.1")
|
implementation("org.apache.commons:commons-text:1.14.0")
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
|||||||
@@ -13,5 +13,5 @@ dependencies {
|
|||||||
implementation(kotlin("scripting-ide-services"))
|
implementation(kotlin("scripting-ide-services"))
|
||||||
|
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
|
||||||
implementation("io.github.oshai:kotlin-logging-jvm:7.0.7")
|
implementation("io.github.oshai:kotlin-logging-jvm:7.0.13")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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:7.0.7")
|
implementation("io.github.oshai:kotlin-logging-jvm:7.0.13")
|
||||||
|
|
||||||
testImplementation(project(":jadx-core"))
|
testImplementation(project(":jadx-core"))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ dependencies {
|
|||||||
implementation(kotlin("scripting-dependencies-maven"))
|
implementation(kotlin("scripting-dependencies-maven"))
|
||||||
|
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
|
||||||
implementation("io.github.oshai:kotlin-logging-jvm:7.0.7")
|
implementation("io.github.oshai:kotlin-logging-jvm:7.0.13")
|
||||||
|
|
||||||
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"))
|
||||||
|
|||||||
@@ -10,5 +10,5 @@ dependencies {
|
|||||||
implementation("com.android.tools.smali:smali:3.0.9") {
|
implementation("com.android.tools.smali:smali:3.0.9") {
|
||||||
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.4.8-jre") // force the latest version for smali
|
implementation("com.google.guava:guava:33.5.0-jre") // force the latest version for smali
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,5 +6,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.13.1")
|
implementation("com.google.code.gson:gson:2.13.2")
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.0")
|
id("org.gradle.toolchains.foojay-resolver-convention") version ("1.0.0")
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!JavaVersion.current().isJava11Compatible) {
|
if (!JavaVersion.current().isJava11Compatible) {
|
||||||
|
|||||||
Reference in New Issue
Block a user