Resolve deprecation warnings

Author: marcphilipp

gradle/plugins/common/src/main/kotlin/junitbuild.kotlin-library-conventions.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -10,24 +12,24 @@ tasks.named("kotlinSourcesJar") {
 }
 
 tasks.withType<KotlinCompile>().configureEach {
-	kotlinOptions {
-		apiVersion = "1.6"
-		languageVersion = "1.6"
+	compilerOptions {
+		apiVersion = KotlinVersion.fromVersion("1.6")
+		languageVersion = apiVersion
 		allWarningsAsErrors = false
 		// Compiler arg is required for Kotlin 1.6 and below
 		// see https://kotlinlang.org/docs/whatsnew17.html#stable-opt-in-requirements
-		freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+		freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
 	}
 }
 
 afterEvaluate {
 	val extension = project.the<JavaLibraryExtension>()
 	tasks {
 		withType<KotlinCompile>().configureEach {
-			kotlinOptions.jvmTarget = extension.mainJavaVersion.toString()
+			compilerOptions.jvmTarget = JvmTarget.fromTarget(extension.mainJavaVersion.toString())
 		}
 		named<KotlinCompile>("compileTestKotlin") {
-			kotlinOptions.jvmTarget = extension.testJavaVersion.toString()
+			compilerOptions.jvmTarget = JvmTarget.fromTarget(extension.testJavaVersion.toString())
 		}
 	}
 }

gradle/plugins/common/src/main/kotlin/junitbuild/java/UpdateJarAction.kt

@@ -2,7 +2,7 @@ package junitbuild.java
 
 import org.gradle.api.Action
 import org.gradle.api.Task
-import org.gradle.api.internal.file.archive.ZipCopyAction
+import org.gradle.api.internal.file.archive.ZipEntryConstants
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
 import org.gradle.jvm.toolchain.JavaLauncher
@@ -19,7 +19,7 @@ abstract class UpdateJarAction @Inject constructor(private val operations: ExecO
         // Since ZipCopyAction.CONSTANT_TIME_FOR_ZIP_ENTRIES is in the default time zone (see its Javadoc),
         // we're converting it to the same time in UTC here to make the jar reproducible regardless of the
         // build's time zone.
-        private val CONSTANT_TIME_FOR_ZIP_ENTRIES = LocalDateTime.ofInstant(Instant.ofEpochMilli(ZipCopyAction.CONSTANT_TIME_FOR_ZIP_ENTRIES), ZoneId.systemDefault())
+        private val CONSTANT_TIME_FOR_ZIP_ENTRIES = LocalDateTime.ofInstant(Instant.ofEpochMilli(ZipEntryConstants.CONSTANT_TIME_FOR_ZIP_ENTRIES), ZoneId.systemDefault())
             .toInstant(ZoneOffset.UTC)
             .toString()
     }