Update gradle & related deps+config and CI JVM version

Author: pimterry

.github/workflows/ci.yml

@@ -14,10 +14,10 @@ jobs:
           java-version: 8
           distribution: adopt-hotspot
 
-      - name: Set up JDK 14 for build
+      - name: Set up JDK 24 for build
         uses: actions/setup-java@v3
         with:
-          java-version: 14
+          java-version: 24
           distribution: adopt-hotspot
 
       - name: Build & test the agent standalone

build.gradle

@@ -10,8 +10,8 @@ buildscript {
 
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '1.6.21'
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
+    id 'org.jetbrains.kotlin.jvm' version '2.2.21'
+    id 'com.gradleup.shadow' version '9.2.2'
 }
 
 group 'tech.httptoolkit'
@@ -90,27 +90,23 @@ shadowJar {
     // We have to specifically exclude our reactor stub code here, because we don't want to the type
     // stubs that we've manually defined in our own source included here.
     exclude 'reactor/'
-}
 
-// As part of bundling the JAR, we relocate all dependencies into our namespace:
-import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
-task relocateShadowJar(type: ConfigureShadowRelocation) {
-    target = tasks.shadowJar
-    prefix = "tech.httptoolkit.relocated"
+    // As part of bundling the JAR, we relocate all dependencies into our namespace:
+    enableAutoRelocation = true
+    relocationPrefix = "tech.httptoolkit.relocated"
 }
-tasks.shadowJar.dependsOn tasks.relocateShadowJar
 
 // Then we take this bundled JAR and optimize it. This shrinks it dramatically, but also breaks it, because
 // bytebuddy depends on some of our source being unmodified by R8 (frames in advice classes get messed with).
-def r8File = new File("$buildDir/libs/$archivesBaseName-r8.jar")
+def r8File = new File("${layout.buildDirectory.get().asFile}/libs/${project.name}-r8.jar")
 tasks.register('r8Jar', JavaExec) { task ->
     def rules = file('r8-rules.txt')
     task.dependsOn(tasks.shadowJar)
     task.outputs.file(r8File)
     task.inputs.files shadowJar.getArchiveFile()
 
     task.classpath(configurations.r8)
-    task.main = 'com.android.tools.r8.R8'
+    task.mainClass = 'com.android.tools.r8.R8'
     task.args = [
             '--release',
             '--classfile',

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

test-app/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'java'
-    id 'com.github.johnrengelman.shadow'
+    id 'com.gradleup.shadow'
     id 'org.jetbrains.kotlin.jvm'
 }
 
@@ -54,11 +54,17 @@ compileJava {
     targetCompatibility = '11'
 }
 
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+}
+
 import com.github.jengelman.gradle.plugins.shadow.transformers.AppendingTransformer
 
-shadowJar {
+tasks.shadowJar {
     transform(AppendingTransformer) {
         resource = 'reference.conf' // Required for akka
     }
-    with jar
+    from jar
 }