From 12ef29bebc72d57160e300ee8c2efcdf59d58c97 Mon Sep 17 00:00:00 2001 From: Skylot Date: Mon, 5 Dec 2022 18:20:06 +0000 Subject: [PATCH] chore: update gradle and dependencies --- build.gradle | 14 +++++++------- gradle/wrapper/gradle-wrapper.properties | 4 ++-- jadx-cli/build.gradle | 2 +- jadx-core/build.gradle | 8 ++++---- jadx-gui/build.gradle | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 8cc408dfe..521145f0d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'com.github.ben-manes.versions' version '0.43.0' - id 'com.diffplug.spotless' version '6.11.0' + id 'com.github.ben-manes.versions' version '0.44.0' + id 'com.diffplug.spotless' version '6.12.0' } ext.jadxVersion = System.getenv('JADX_VERSION') ?: "dev" @@ -26,18 +26,18 @@ allprojects { } dependencies { - implementation 'org.slf4j:slf4j-api:2.0.3' - compileOnly 'org.jetbrains:annotations:23.0.0' + implementation 'org.slf4j:slf4j-api:2.0.5' + compileOnly 'org.jetbrains:annotations:23.1.0' - testImplementation 'ch.qos.logback:logback-classic:1.3.4' + testImplementation 'ch.qos.logback:logback-classic:1.3.5' testImplementation 'org.hamcrest:hamcrest-library:2.2' - testImplementation 'org.mockito:mockito-core:4.8.0' + testImplementation 'org.mockito:mockito-core:4.9.0' testImplementation 'org.assertj:assertj-core:3.23.1' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.1' - testCompileOnly 'org.jetbrains:annotations:23.0.0' + testCompileOnly 'org.jetbrains:annotations:23.1.0' } test { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b916c04db..03ca076c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=f6b8596b10cce501591e92f229816aa4046424f3b24d771751b06779d58c8ec4 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/jadx-cli/build.gradle b/jadx-cli/build.gradle index 17ed5dfac..477c11f98 100644 --- a/jadx-cli/build.gradle +++ b/jadx-cli/build.gradle @@ -11,7 +11,7 @@ dependencies { runtimeOnly(project(':jadx-plugins:jadx-smali-input')) implementation 'com.beust:jcommander:1.82' - implementation 'ch.qos.logback:logback-classic:1.3.4' + implementation 'ch.qos.logback:logback-classic:1.3.5' } application { diff --git a/jadx-core/build.gradle b/jadx-core/build.gradle index 0d8d3feba..6448c5e18 100644 --- a/jadx-core/build.gradle +++ b/jadx-core/build.gradle @@ -5,11 +5,11 @@ plugins { dependencies { api(project(':jadx-plugins:jadx-plugins-api')) - implementation 'com.google.code.gson:gson:2.9.1' + implementation 'com.google.code.gson:gson:2.10' // TODO: move resources decoding to separate plugin module implementation 'com.android.tools.build:aapt2-proto:7.3.1-8691043' - implementation 'com.google.protobuf:protobuf-java:3.21.8' // forcing latest version + implementation 'com.google.protobuf:protobuf-java:3.21.11' // forcing latest version testImplementation 'org.apache.commons:commons-lang3:3.12.0' @@ -19,8 +19,8 @@ dependencies { testRuntimeOnly(project(':jadx-plugins:jadx-java-input')) testRuntimeOnly(project(':jadx-plugins:jadx-raung-input')) - testImplementation 'org.eclipse.jdt:ecj:3.31.0' - testImplementation 'tools.profiler:async-profiler:1.8.3' + testImplementation 'org.eclipse.jdt:ecj:3.32.0' + testImplementation 'tools.profiler:async-profiler:2.9' } test { diff --git a/jadx-gui/build.gradle b/jadx-gui/build.gradle index 01569b3c7..b2e3bb2b3 100644 --- a/jadx-gui/build.gradle +++ b/jadx-gui/build.gradle @@ -1,6 +1,6 @@ plugins { id 'application' - id 'edu.sc.seis.launch4j' version '2.5.3' + id 'edu.sc.seis.launch4j' version '2.5.4' id 'com.github.johnrengelman.shadow' version '7.1.2' id 'org.beryx.runtime' version '1.12.7' } @@ -9,7 +9,7 @@ dependencies { implementation(project(':jadx-core')) implementation(project(":jadx-cli")) implementation 'com.beust:jcommander:1.82' - implementation 'ch.qos.logback:logback-classic:1.3.4' + implementation 'ch.qos.logback:logback-classic:1.3.5' implementation 'com.fifesoft:rsyntaxtextarea:3.3.0' implementation files('libs/jfontchooser-1.0.5.jar') @@ -20,7 +20,7 @@ dependencies { implementation 'com.formdev:flatlaf-extras:2.6' implementation 'com.formdev:svgSalamander:1.1.4' - implementation 'com.google.code.gson:gson:2.9.1' + implementation 'com.google.code.gson:gson:2.10' implementation 'org.apache.commons:commons-lang3:3.12.0' implementation 'org.apache.commons:commons-text:1.10.0'