From 792e0d6f3a0e47bd6f2034b07091b17134dfbddb Mon Sep 17 00:00:00 2001
From: Skylot <118523+skylot@users.noreply.github.com>
Date: Sat, 16 Nov 2024 17:26:04 +0000
Subject: [PATCH] chore: update gradle and dependencies

---
 buildSrc/src/main/kotlin/jadx-java.gradle.kts      |  1 +
 buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts   | 10 ++++------
 gradle/wrapper/gradle-wrapper.properties           |  4 ++--
 jadx-gui/build.gradle.kts                          |  2 +-
 jadx-plugins/jadx-kotlin-metadata/build.gradle.kts |  2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/buildSrc/src/main/kotlin/jadx-java.gradle.kts b/buildSrc/src/main/kotlin/jadx-java.gradle.kts
index 7078dfbb..f89c2d95 100644
--- a/buildSrc/src/main/kotlin/jadx-java.gradle.kts
+++ b/buildSrc/src/main/kotlin/jadx-java.gradle.kts
@@ -45,6 +45,7 @@ java {
 tasks {
 	compileJava {
 		options.encoding = "UTF-8"
+		// options.compilerArgs = listOf("-Xlint:deprecation")
 	}
 	jar {
 		manifest {
diff --git a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts b/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts
index 09997184..9d7b58b3 100644
--- a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts
+++ b/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts
@@ -1,5 +1,3 @@
-import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-
 plugins {
 	id("org.openrewrite.rewrite")
 }
@@ -9,10 +7,10 @@ repositories {
 }
 
 dependencies {
-	rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:2.21.0")
-	rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:2.15.1")
-	rewrite("org.openrewrite.recipe:rewrite-migrate-java:2.28.0")
-	rewrite("org.openrewrite.recipe:rewrite-static-analysis:1.19.0")
+	rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:2.22.0")
+	rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:2.16.0")
+	rewrite("org.openrewrite.recipe:rewrite-migrate-java:2.29.0")
+	rewrite("org.openrewrite.recipe:rewrite-static-analysis:1.20.0")
 }
 
 tasks {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fb602ee2..82dd18b2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionSha256Sum=57dafb5c2622c6cc08b993c85b7c06956a2f53536432a30ead46166dbca0f1e9
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts
index fde55017..ecbf810b 100644
--- a/jadx-gui/build.gradle.kts
+++ b/jadx-gui/build.gradle.kts
@@ -48,7 +48,7 @@ dependencies {
 	implementation("com.android.tools.build:apksig:8.7.2")
 	implementation("io.github.skylot:jdwp:2.0.0")
 
-	testImplementation(project(":jadx-core").dependencyProject.sourceSets.getByName("test").output)
+	testImplementation(project.project(":jadx-core").sourceSets.getByName("test").output)
 }
 
 val jadxVersion: String by rootProject.extra
diff --git a/jadx-plugins/jadx-kotlin-metadata/build.gradle.kts b/jadx-plugins/jadx-kotlin-metadata/build.gradle.kts
index 041be21c..57c6519c 100644
--- a/jadx-plugins/jadx-kotlin-metadata/build.gradle.kts
+++ b/jadx-plugins/jadx-kotlin-metadata/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
 
 	implementation("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.9.0")
 
-	testImplementation(project(":jadx-core").dependencyProject.sourceSets.test.get().output)
+	testImplementation(project.project(":jadx-core").sourceSets.getByName("test").output)
 	testImplementation("org.apache.commons:commons-lang3:3.17.0")
 
 	testRuntimeOnly(project(":jadx-plugins:jadx-smali-input"))