chore: update dependencies

This commit is contained in:
Skylot
2023-06-07 21:20:05 +01:00
parent 83b6ffbba9
commit eb4d540b04
9 changed files with 14 additions and 14 deletions
+1 -1
View File
@@ -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"
+2 -2
View File
@@ -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'
+4 -5
View File
@@ -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
@@ -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")
@@ -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) {
@@ -43,7 +43,7 @@ private fun IAnnotation.getParamsAsList(paramName: String): List<EncodedValue>?
private fun IAnnotation.getParamAsStringArray(paramName: String): Array<String>? {
return getParamsAsList(paramName)
?.map<EncodedValue, Any?>(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()
}
@@ -29,7 +29,7 @@ class TestKotlinMetadata : SmaliTest() {
}
}
}
*/
*/
// @formatter:on
@Test
@@ -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()
}
@@ -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) {