Kotlin 1.6.20

Author: tschuchortdev

.idea/.gitignore

@@ -1,5 +1,6 @@
 buildscript {
     ext.kotlin_version = '1.6.10'
+    ext.embedded_kotlin_version =  '1.6.20-dev-7317'//'1.6.20-M1-1.0.2'
 
     repositories {
         mavenCentral()
@@ -41,13 +42,14 @@ allprojects {
             mavenCentral()
             maven { url "https://plugins.gradle.org/m2/" }
             google()
+            maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap' }
         }
     }
 
     repositories {
         mavenCentral()
         google()
-        jcenter()
+        maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap' }
     }
 
     apply plugin: 'kotlin'

.idea/codeStyles/Project.xml

@@ -10,7 +10,7 @@ buildConfig {
     packageName = "com.tschuchort.compiletesting"
     sourceSets {
         test {
-            buildConfigField 'String', 'KOTLIN_VERSION', "\"$kotlin_version\""
+            buildConfigField 'String', 'KOTLIN_VERSION', "\"$embedded_kotlin_version\""
         }
     }
 }
@@ -28,15 +28,15 @@ dependencies {
 
     // This dependency is only needed as a "sample" compiler plugin to test that
     // running compiler plugins passed via the pluginClasspath CLI option works
-    testRuntimeOnly "org.jetbrains.kotlin:kotlin-scripting-compiler:$kotlin_version"
+    testRuntimeOnly "org.jetbrains.kotlin:kotlin-scripting-compiler:$embedded_kotlin_version"
 
     // Include Kotlin/JS standard library in test classpath for auto loading
     testRuntimeOnly "org.jetbrains.kotlin:kotlin-stdlib-js"
 
     // The Kotlin compiler should be near the end of the list because its .jar file includes
     // an obsolete version of Guava
-    api "org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlin_version"
-    implementation "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable:$kotlin_version"
+    api "org.jetbrains.kotlin:kotlin-compiler-embeddable:$embedded_kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable:$embedded_kotlin_version"
 }
 
 compileKotlin {

.idea/vcs.xml

@@ -14,9 +14,12 @@ import org.jetbrains.kotlin.cli.jvm.plugins.ServiceLoaderLite
 import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
 import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
 import org.jetbrains.kotlin.config.Services
+import org.jetbrains.kotlin.load.java.JvmAbi
 import java.io.File
 import java.io.OutputStream
 import java.io.PrintStream
+import java.lang.reflect.InvocationTargetException
+import java.lang.reflect.ReflectPermission
 import java.net.URI
 import java.nio.file.Files
 import java.nio.file.Paths
@@ -103,6 +106,17 @@ abstract class AbstractKotlinCompilation<A : CommonCompilerArguments> internal c
     // Directory for input source files
     protected val sourcesDir get() = workingDir.resolve("sources")
 
+    protected inline fun <reified T> CommonCompilerArguments.trySetDeprecatedOption(optionSimpleName: String, value: T) {
+        try {
+            this.javaClass.getMethod(JvmAbi.setterName(optionSimpleName), T::class.java).invoke(this, value)
+        } catch (e: ReflectiveOperationException) {
+            throw IllegalArgumentException(
+                "The deprecated option $optionSimpleName is no longer available in the kotlin version you are using",
+                e
+            )
+        }
+    }
+
     protected fun commonArguments(args: A, configuration: (args: A) -> Unit): A {
         args.pluginClasspaths = pluginClasspaths.map(File::getAbsolutePath).toTypedArray()
 

build.gradle

@@ -92,6 +92,7 @@ class KotlinCompilation : AbstractKotlinCompilation<K2JVMCompilerArguments>() {
 	var noParamAssertions: Boolean = false
 
 	/** Generate nullability assertions for non-null Java expressions */
+	@Deprecated("Removed in latest Kotlin version")
 	var strictJavaNullabilityAssertions: Boolean? = null
 
 	/** Disable optimizations */
@@ -103,6 +104,7 @@ class KotlinCompilation : AbstractKotlinCompilation<K2JVMCompilerArguments>() {
 	 *
 	 * {disable|enable}
 	 */
+	@Deprecated("Removed in latest Kotlin version")
 	var constructorCallNormalizationMode: String? = null
 
 	/** Assert calls behaviour {always-enable|always-disable|jvm|legacy} */
@@ -118,7 +120,8 @@ class KotlinCompilation : AbstractKotlinCompilation<K2JVMCompilerArguments>() {
 	var useTypeTable: Boolean = false
 
 	/** Allow Kotlin runtime libraries of incompatible versions in the classpath */
-	var skipRuntimeVersionCheck: Boolean = false
+	@Deprecated("Removed in latest Kotlin version")
+	var skipRuntimeVersionCheck: Boolean? = null
 
 	/** Path to JSON file to dump Java to Kotlin declaration mappings */
 	var declarationsOutputPath: File? = null
@@ -145,7 +148,8 @@ class KotlinCompilation : AbstractKotlinCompilation<K2JVMCompilerArguments>() {
 	var supportCompatqualCheckerFrameworkAnnotations: String? = null
 
 	/** Do not throw NPE on explicit 'equals' call for null receiver of platform boxed primitive type */
-	var noExceptionOnExplicitEqualsForBoxedNull: Boolean = false
+	@Deprecated("Removed in latest Kotlin version")
+	var noExceptionOnExplicitEqualsForBoxedNull: Boolean? = null
 
 	/** Allow to use '@JvmDefault' annotation for JVM default method support.
 	 * {disable|enable|compatibility}
@@ -328,13 +332,17 @@ class KotlinCompilation : AbstractKotlinCompilation<K2JVMCompilerArguments>() {
 		args.noCallAssertions = noCallAssertions
 		args.noParamAssertions = noParamAssertions
 		args.noReceiverAssertions = noReceiverAssertions
-                strictJavaNullabilityAssertions?.let {
-                    args.strictJavaNullabilityAssertions = it
-		}
+
+		// TODO: Remove after kotlin 1.6.30
+		if(strictJavaNullabilityAssertions != null)
+			args.trySetDeprecatedOption("strictJavaNullabilityAssertions", strictJavaNullabilityAssertions)
+
 		args.noOptimize = noOptimize
 
+		// TODO: Remove after kotlin 1.6.30
 		if(constructorCallNormalizationMode != null)
-			args.constructorCallNormalizationMode = constructorCallNormalizationMode
+			args.trySetDeprecatedOption("constructorCallNormalizationMode", constructorCallNormalizationMode)
+
 
 		if(assertionsMode != null)
 			args.assertionsMode = assertionsMode
@@ -366,8 +374,14 @@ class KotlinCompilation : AbstractKotlinCompilation<K2JVMCompilerArguments>() {
 		if(scriptResolverEnvironment.isNotEmpty())
 			args.scriptResolverEnvironment = scriptResolverEnvironment.map { (key, value) -> "$key=\"$value\"" }.toTypedArray()
 
-		args.noExceptionOnExplicitEqualsForBoxedNull = noExceptionOnExplicitEqualsForBoxedNull
-		args.skipRuntimeVersionCheck = skipRuntimeVersionCheck
+		// TODO: Remove after kotlin 1.6.30
+		if(noExceptionOnExplicitEqualsForBoxedNull != null)
+			args.trySetDeprecatedOption("noExceptionOnExplicitEqualsForBoxedNull", noExceptionOnExplicitEqualsForBoxedNull)
+
+		// TODO: Remove after kotlin 1.6.30
+		if(skipRuntimeVersionCheck != null)
+			args.trySetDeprecatedOption("skipRuntimeVersionCheck", skipRuntimeVersionCheck)
+
         args.javaPackagePrefix = javaPackagePrefix
         args.suppressMissingBuiltinsError = suppressMissingBuiltinsError
 	}

core/build.gradle

@@ -7,7 +7,6 @@ import java.io.File
 fun defaultCompilerConfig(): KotlinCompilation {
     return KotlinCompilation( ).apply {
         inheritClassPath = false
-        skipRuntimeVersionCheck = true
         correctErrorTypes = true
         verbose = true
         reportOutputFiles = false

core/src/main/kotlin/com/tschuchort/compiletesting/AbstractKotlinCompilation.kt

@@ -1,5 +1,5 @@
 buildscript {
-    ext.ksp_version='1.6.10-1.0.2'
+    ext.ksp_version='1.6.20-M1-1.0.2'
 }
 
 dependencies {