From eb4d540b04e2d6a74e610c5f7afaa4ef0cd7feb7 Mon Sep 17 00:00:00 2001 From: Skylot Date: Wed, 7 Jun 2023 21:20:05 +0100 Subject: [PATCH] chore: update dependencies --- build.gradle | 2 +- jadx-core/build.gradle | 4 ++-- jadx-gui/build.gradle | 9 ++++----- jadx-plugins/jadx-kotlin-metadata/build.gradle.kts | 2 +- .../kotlin/metadata/pass/KotlinMetadataDecompilePass.kt | 3 ++- .../plugins/kotlin/metadata/utils/KotlinMetadataExt.kt | 2 +- .../src/test/kotlin/TestKotlinMetadata.kt | 2 +- .../jadx-script/examples/scripts/stages.jadx.kts | 2 +- .../src/main/kotlin/jadx/plugins/script/ScriptEval.kt | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 847a61b06..12424fab5 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'com.github.ben-manes.versions' version '0.46.0' id 'se.patrikerdes.use-latest-versions' version '0.2.18' - id 'com.diffplug.spotless' version '6.18.0' + id 'com.diffplug.spotless' version '6.19.0' } ext.jadxVersion = System.getenv('JADX_VERSION') ?: "dev" diff --git a/jadx-core/build.gradle b/jadx-core/build.gradle index 2a92adef5..f651e730e 100644 --- a/jadx-core/build.gradle +++ b/jadx-core/build.gradle @@ -8,8 +8,8 @@ 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.0.1-9289358' - implementation 'com.google.protobuf:protobuf-java:3.23.0' // forcing latest version + implementation 'com.android.tools.build:aapt2-proto:8.0.2-9289358' + implementation 'com.google.protobuf:protobuf-java:3.23.2' // forcing latest version testImplementation 'org.apache.commons:commons-lang3:3.12.0' diff --git a/jadx-gui/build.gradle b/jadx-gui/build.gradle index 18f0b1d59..b53645a00 100644 --- a/jadx-gui/build.gradle +++ b/jadx-gui/build.gradle @@ -1,7 +1,7 @@ plugins { id 'jadx-kotlin' id 'application' - id 'edu.sc.seis.launch4j' version '2.5.4' + id 'edu.sc.seis.launch4j' version '3.0.1' id 'com.github.johnrengelman.shadow' version '8.1.1' id 'org.beryx.runtime' version '1.13.0' } @@ -44,7 +44,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.0.1' + implementation 'com.android.tools.build:apksig:8.0.2' implementation 'io.github.skylot:jdwp:2.0.0' testImplementation project(":jadx-core").sourceSets.test.output @@ -105,14 +105,13 @@ launch4j { copyConfigurable = [] jarTask = project.tasks.shadowJar icon = "${projectDir}/src/main/resources/logos/jadx-logo.ico" - outfile = "jadx-gui-${version}.exe" + outfile = "jadx-gui-${project.jadxVersion}.exe" copyright = 'Skylot' windowTitle = 'jadx' companyName = 'jadx' jreMinVersion = '11' jvmOptions = application.getApplicationDefaultJvmArgs() - jreRuntimeBits = "64" - bundledJre64Bit = true + requires64Bit = true initialHeapPercent = 5 maxHeapSize = 4096 maxHeapPercent = 70 diff --git a/jadx-plugins/jadx-kotlin-metadata/build.gradle.kts b/jadx-plugins/jadx-kotlin-metadata/build.gradle.kts index ac86b3534..5eb4a281e 100644 --- a/jadx-plugins/jadx-kotlin-metadata/build.gradle.kts +++ b/jadx-plugins/jadx-kotlin-metadata/build.gradle.kts @@ -6,7 +6,7 @@ plugins { dependencies { api(project(":jadx-core")) - implementation("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.0") + implementation("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.2") testImplementation(project(":jadx-core").dependencyProject.sourceSets.test.get().output) testImplementation("org.apache.commons:commons-lang3:3.12.0") diff --git a/jadx-plugins/jadx-kotlin-metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/pass/KotlinMetadataDecompilePass.kt b/jadx-plugins/jadx-kotlin-metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/pass/KotlinMetadataDecompilePass.kt index d3d058490..4c4a22d1a 100644 --- a/jadx-plugins/jadx-kotlin-metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/pass/KotlinMetadataDecompilePass.kt +++ b/jadx-plugins/jadx-kotlin-metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/pass/KotlinMetadataDecompilePass.kt @@ -42,7 +42,8 @@ class KotlinMetadataDecompilePass( return false } - override fun visit(mth: MethodNode?) { /* no op */ + override fun visit(mth: MethodNode?) { + /* no op */ } private fun renameMethodArgs(wrapper: KmClassWrapper) { diff --git a/jadx-plugins/jadx-kotlin-metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/utils/KotlinMetadataExt.kt b/jadx-plugins/jadx-kotlin-metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/utils/KotlinMetadataExt.kt index 64c8648aa..378391600 100644 --- a/jadx-plugins/jadx-kotlin-metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/utils/KotlinMetadataExt.kt +++ b/jadx-plugins/jadx-kotlin-metadata/src/main/kotlin/jadx/plugins/kotlin/metadata/utils/KotlinMetadataExt.kt @@ -43,7 +43,7 @@ private fun IAnnotation.getParamsAsList(paramName: String): List? private fun IAnnotation.getParamAsStringArray(paramName: String): Array? { return getParamsAsList(paramName) ?.map(EncodedValue::getValue) - ?.onEach { if (it != null && it !is String) /* TODO is this valid ? */ return@onEach } + ?.onEach { if (it != null && it !is String) return@onEach } ?.map { "$it" } ?.toTypedArray() } diff --git a/jadx-plugins/jadx-kotlin-metadata/src/test/kotlin/TestKotlinMetadata.kt b/jadx-plugins/jadx-kotlin-metadata/src/test/kotlin/TestKotlinMetadata.kt index 5164b8201..1d6a6e00f 100644 --- a/jadx-plugins/jadx-kotlin-metadata/src/test/kotlin/TestKotlinMetadata.kt +++ b/jadx-plugins/jadx-kotlin-metadata/src/test/kotlin/TestKotlinMetadata.kt @@ -29,7 +29,7 @@ class TestKotlinMetadata : SmaliTest() { } } } - */ + */ // @formatter:on @Test diff --git a/jadx-plugins/jadx-script/examples/scripts/stages.jadx.kts b/jadx-plugins/jadx-script/examples/scripts/stages.jadx.kts index 7120d7d3f..b12ef7ec6 100644 --- a/jadx-plugins/jadx-script/examples/scripts/stages.jadx.kts +++ b/jadx-plugins/jadx-script/examples/scripts/stages.jadx.kts @@ -59,6 +59,6 @@ jadx.afterLoad { Start full decompilation (optional): 1. jadx-cli start decompilation automatically 2. jadx-gui start decompilation only on class open or search, so you might need to force it - */ + */ // jadx.decompile.all() } diff --git a/jadx-plugins/jadx-script/jadx-script-plugin/src/main/kotlin/jadx/plugins/script/ScriptEval.kt b/jadx-plugins/jadx-script/jadx-script-plugin/src/main/kotlin/jadx/plugins/script/ScriptEval.kt index 1fd4b16b4..2d3dbf179 100644 --- a/jadx-plugins/jadx-script/jadx-script-plugin/src/main/kotlin/jadx/plugins/script/ScriptEval.kt +++ b/jadx-plugins/jadx-script/jadx-script-plugin/src/main/kotlin/jadx/plugins/script/ScriptEval.kt @@ -72,7 +72,7 @@ class ScriptEval { Severity.FATAL, Severity.ERROR -> log.error(r.exception) { "Script execution error: $msg" } Severity.WARNING -> log.warn { "Script execution issue: $msg" } Severity.INFO -> log.info { "Script report: $msg" } - Severity.DEBUG -> {} /* ignore, too verbose */ + Severity.DEBUG -> {} // ignore, too verbose } } when (res) {