Bump Kotlin to 1.4.20 (#938)

build.gradle.kts

@@ -36,7 +36,7 @@ allprojects {
         tasks.withType<KotlinCompile<*>> {
             if (this is KotlinJvmCompile) {
                 kotlinOptions {
-                    apiVersion = "1.3"
+                    apiVersion = "1.4"
                     jvmTarget = "1.8"
                 }
             } else {

buildSrc/build.gradle.kts

@@ -10,10 +10,10 @@ repositories {
 }
 
 dependencies {
-    api(kotlin("gradle-plugin", version = "1.4.0"))
+    api(kotlin("gradle-plugin", version = "1.4.20"))
     api("org.jetbrains.dokka:dokka-gradle-plugin:1.4.0-rc")
     api("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4")
     api("gradle.plugin.org.jetbrains.intellij.plugins:gradle-intellij-plugin:0.4.21")
     api("com.github.jengelman.gradle.plugins:shadow:4.0.2")
-    implementation(kotlin("reflect", version = "1.4.0"))
+    implementation(kotlin("reflect", version = "1.4.20"))
 }

buildSrc/src/main/kotlin/Dependencies.kt

@@ -16,7 +16,7 @@ object Dependencies {
     val mockitoCore = "org.mockito:mockito-core:2.23.4"
     val mockitoInline = "org.mockito:mockito-inline:2.23.4"
 
-    val kotlinCoroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9"
+    val kotlinCoroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1"
 
     val autoService = "com.google.auto.service:auto-service:1.0-rc4"
 }

gradle.properties

@@ -1,3 +1,4 @@
 # This causes problems with composite builds!
-#kotlin.mpp.enableGranularSourceSetsMetadata=false
+#kotlin.mpp.enableGranularSourceSetsMetadata=true
+#kotlin.native.enableDependencyPropagation=false
 org.gradle.jvmargs=-Xmx3G

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

integration-test/buildSrc/build.gradle.kts

@@ -3,6 +3,6 @@ repositories {
 }
 
 dependencies {
-  implementation(kotlin("gradle-plugin", version = "1.4.0"))
-  implementation(kotlin("reflect", version = "1.4.0"))
+  implementation(kotlin("gradle-plugin", version = "1.4.20"))
+  implementation(kotlin("reflect", version = "1.4.20"))
 }

integration-test/gradle.properties

@@ -1,3 +1,4 @@
 # This causes problems with composite builds!
-#kotlin.mpp.enableGranularSourceSetsMetadata=false
+#kotlin.mpp.enableGranularSourceSetsMetadata=true
+#kotlin.native.enableDependencyPropagation=false
 org.gradle.jvmargs=-Xmx3G

integration-test/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

integration-test/gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

integration-test/gradlew.bat

@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

spek-gradle-plugin/build.gradle.kts

@@ -19,7 +19,6 @@ gradlePlugin {
 val autoService = "com.google.auto.service:auto-service:1.0-rc4"
 
 dependencies {
-    implementation(kotlin("stdlib"))
     implementation(kotlin("gradle-plugin"))
     implementation(kotlin("gradle-plugin-api"))
 

spek-kotlin-compiler-plugin-native/src/main/kotlin/org/spekframework/spek2/kotlin/SpekExtension.kt

@@ -3,16 +3,16 @@ package org.spekframework.spek2.kotlin
 import org.jetbrains.kotlin.backend.common.descriptors.synthesizedName
 import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
 import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
+import org.jetbrains.kotlin.backend.common.ir.addChild
 import org.jetbrains.kotlin.backend.common.lower.DeclarationIrBuilder
-import org.jetbrains.kotlin.descriptors.ClassKind
-import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.descriptors.Visibilities
-import org.jetbrains.kotlin.descriptors.findClassAcrossModuleDependencies
+import org.jetbrains.kotlin.backend.common.serialization.knownBuiltins
+import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.builders.*
 import org.jetbrains.kotlin.ir.builders.declarations.addField
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrFunctionImpl
+import org.jetbrains.kotlin.ir.descriptors.WrappedFieldDescriptor
 import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrBlock
 import org.jetbrains.kotlin.ir.expressions.IrExpression
@@ -21,6 +21,8 @@ import org.jetbrains.kotlin.ir.expressions.impl.IrBlockImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrClassReferenceImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrExpressionBodyImpl
 import org.jetbrains.kotlin.ir.expressions.impl.IrFunctionReferenceImpl
+import org.jetbrains.kotlin.ir.symbols.IrFieldSymbol
+import org.jetbrains.kotlin.ir.symbols.impl.IrFieldSymbolImpl
 import org.jetbrains.kotlin.ir.symbols.impl.IrSimpleFunctionSymbolImpl
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.getClass
@@ -132,7 +134,7 @@ private class SpekCollector(
                 IrDeclarationOrigin.LOCAL_FUNCTION_FOR_LAMBDA,
                 IrSimpleFunctionSymbolImpl(descriptor),
                 Name.special("<anonymous>"),
-                Visibilities.LOCAL,
+                DescriptorVisibilities.LOCAL,
                 Modality.FINAL,
                 declaration.defaultType,
                 isInline = false,
@@ -141,7 +143,8 @@ private class SpekCollector(
                 isSuspend = false,
                 isExpect = false,
                 isOperator = false,
-                isFakeOverride = false
+                isFakeOverride = false,
+                isInfix = false,
         ).apply {
             descriptor.bind(this)
             parent = this@SpekCollector.file
@@ -168,22 +171,29 @@ private var topLevelInitializersCounter = 0
 // 2. creates a property using the previously declared field as its backing field
 // Previously a top level field would cause the object to created but now it requires a property
 private fun IrFile.addTopLevelInitializer(expression: IrExpression, pluginContext: IrPluginContext) {
-    val threadLocalAnnotation = pluginContext.builtIns.builtInsModule.findClassAcrossModuleDependencies(
+    val threadLocalAnnotation = pluginContext.irBuiltIns.builtIns.builtInsModule.findClassAcrossModuleDependencies(
             ClassId.topLevel(FqName("kotlin.native.concurrent.ThreadLocal")))!!
     val t = pluginContext.symbols.externalSymbolTable.referenceClass(threadLocalAnnotation)
     val fieldName = "topLevelInitializer${topLevelInitializersCounter++}".synthesizedName
 
-    addField {
-        name = fieldName
-        isFinal = true
-        isStatic = true
-        visibility = Visibilities.PRIVATE
-        type = expression.type
-        origin = IrDeclarationOrigin.PROPERTY_BACKING_FIELD
-    }.also { field ->
-        field.parent = this@addTopLevelInitializer
-        field.initializer = IrExpressionBodyImpl(startOffset, endOffset, expression)
-        field.annotations += DeclarationIrBuilder(pluginContext, field.symbol, startOffset, endOffset).irCallConstructor(t.constructors.first(), emptyList())
+    val descriptor = WrappedFieldDescriptor()
+    pluginContext.irFactory.createField(
+        startOffset,
+        endOffset,
+        IrDeclarationOrigin.PROPERTY_BACKING_FIELD,
+        IrFieldSymbolImpl(descriptor),
+        fieldName,
+        expression.type,
+        DescriptorVisibilities.PRIVATE,
+        true,
+        false,
+        true
+    ).apply {
+        addChild(this)
+        descriptor.bind(this)
+        parent = this@addTopLevelInitializer
+        initializer = IrExpressionBodyImpl(startOffset, endOffset, expression)
+        annotations += DeclarationIrBuilder(pluginContext, this.symbol, startOffset, endOffset).irCallConstructor(t.constructors.first(), emptyList())
     }
 
 // Don't need a property anymore for a field to be initialized (in 1.4), previously this was needed.