Update Kotlin

build.gradle

@@ -10,7 +10,7 @@ buildscript {
 
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '1.6.21'
+    id 'org.jetbrains.kotlin.jvm' version '1.8.22'
     id 'com.github.johnrengelman.shadow' version '7.1.2'
 }
 
@@ -60,12 +60,6 @@ compileJava {
     targetCompatibility = '1.8'
 }
 
-compileKotlin {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-
 tasks.withType(Jar) {
     manifest {
         attributes 'Premain-Class': 'tech.httptoolkit.javaagent.HttpProxyAgent'

src/main/kotlin/tech/httptoolkit/javaagent/AgentMain.kt

@@ -12,6 +12,7 @@ import net.bytebuddy.dynamic.scaffold.TypeValidation
 import net.bytebuddy.matcher.ElementMatchers.none
 import net.bytebuddy.pool.TypePool
 import net.bytebuddy.utility.JavaModule
+import net.bytebuddy.utility.nullability.MaybeNull
 import java.lang.instrument.Instrumentation
 import javax.net.ssl.SSLContext
 import java.net.*
@@ -137,9 +138,9 @@ abstract class MatchingAgentTransformer(private val logger: TransformationLogger
     override fun transform(
         builder: DynamicType.Builder<*>,
         typeDescription: TypeDescription,
-        classLoader: ClassLoader?,
-        module: JavaModule?,
-        protectionDomain: ProtectionDomain?
+        @MaybeNull classLoader: ClassLoader?,
+        @MaybeNull module: JavaModule?,
+        protectionDomain: ProtectionDomain
     ): DynamicType.Builder<*> {
         logger.beforeTransformation(typeDescription)
 

src/main/kotlin/tech/httptoolkit/javaagent/TransformationLogger.kt

@@ -4,6 +4,7 @@ import net.bytebuddy.agent.builder.AgentBuilder
 import net.bytebuddy.description.type.TypeDescription
 import net.bytebuddy.dynamic.DynamicType
 import net.bytebuddy.utility.JavaModule
+import net.bytebuddy.utility.nullability.MaybeNull
 
 class TransformationLogger(private val debugMode: Boolean) : AgentBuilder.Listener.Adapter() {
 
@@ -33,11 +34,11 @@ class TransformationLogger(private val debugMode: Boolean) : AgentBuilder.Listen
     }
 
     override fun onTransformation(
-        typeDescription: TypeDescription?,
-        classLoader: ClassLoader?,
-        module: JavaModule?,
+        typeDescription: TypeDescription,
+        @MaybeNull classLoader: ClassLoader?,
+        @MaybeNull module: JavaModule?,
         loaded: Boolean,
-        dynamicType: DynamicType?
+        dynamicType: DynamicType
     ) {
         if (debugMode) {
             println("Proxy hooks configured for $typeDescription")