Merge pull request #19 from bnorm/kotlin-1.5.0

Update to Kotlin 1.5.0

Author: bnorm

build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-  kotlin("jvm") version "1.4.30" apply false
-  kotlin("js") version "1.4.30" apply false
+  kotlin("jvm") version "1.5.0" apply false
+  kotlin("js") version "1.5.0" apply false
   id("org.jetbrains.dokka") version "0.10.0" apply false
   id("com.gradle.plugin-publish") version "0.11.0" apply false
   id("com.github.gmazzo.buildconfig") version "2.0.2" apply false
@@ -14,7 +14,6 @@ allprojects {
 subprojects {
   repositories {
     mavenCentral()
-    jcenter()
-    maven { setUrl("https://dl.bintray.com/kotlin/kotlin-js-wrappers") }
+    maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers")
   }
 }

kotlin-react-function-plugin/build.gradle.kts

@@ -18,19 +18,18 @@ val jsCompileTest by configurations.creating {
 }
 
 dependencies {
-  implementation(kotlin("stdlib-jdk8"))
   compileOnly("org.jetbrains.kotlin:kotlin-compiler-embeddable")
 
-  kapt("com.google.auto.service:auto-service:1.0-rc6")
-  compileOnly("com.google.auto.service:auto-service-annotations:1.0-rc6")
+  kapt("com.google.auto.service:auto-service:1.0")
+  compileOnly("com.google.auto.service:auto-service-annotations:1.0")
 
   testImplementation(kotlin("test-junit"))
   testImplementation("org.jetbrains.kotlin:kotlin-compiler-embeddable")
-  testImplementation("com.github.tschuchortdev:kotlin-compile-testing:1.3.0")
+  testImplementation("com.github.tschuchortdev:kotlin-compile-testing:1.3.6")
 
   jsCompileTest(kotlin("stdlib-js"))
   jsCompileTest(project(":kotlin-react-function"))
-  jsCompileTest("org.jetbrains:kotlin-react-dom:17.0.0-pre.129-kotlin-1.4.20")
+  jsCompileTest("org.jetbrains:kotlin-react-dom:17.0.2-pre.154-kotlin-1.5.0")
 }
 
 // Download and relocate the Kotlin/JS dependencies for use by unit tests

kotlin-react-function-plugin/src/main/kotlin/com/bnorm/react/ReactFunctionCallTransformer.kt

@@ -45,7 +45,6 @@ import org.jetbrains.kotlin.ir.declarations.IrFile
 import org.jetbrains.kotlin.ir.declarations.IrProperty
 import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
 import org.jetbrains.kotlin.ir.declarations.path
-import org.jetbrains.kotlin.ir.declarations.persistent.PersistentIrBodyBase
 import org.jetbrains.kotlin.ir.expressions.IrBlockBody
 import org.jetbrains.kotlin.ir.expressions.IrBody
 import org.jetbrains.kotlin.ir.expressions.IrCall
@@ -205,7 +204,7 @@ class ReactFunctionCallTransformer(
                     }
                   }
                 } else if (owner.name == Name.special("<this>") &&
-                  owner.parent == (body as PersistentIrBodyBase<*>).container
+                  expression.type == classes.react.RBuilder
                 ) {
                   return context.irBuilder(expression.symbol).run {
                     irGet(rBuilder)

kotlin-react-function-plugin/src/main/kotlin/com/bnorm/react/irUtils.kt

@@ -28,9 +28,6 @@ import org.jetbrains.kotlin.ir.declarations.IrDeclarationParent
 import org.jetbrains.kotlin.ir.declarations.IrFactory
 import org.jetbrains.kotlin.ir.declarations.IrProperty
 import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
-import org.jetbrains.kotlin.ir.declarations.lazy.IrLazyFunction
-import org.jetbrains.kotlin.ir.descriptors.WrappedFunctionDescriptorWithContainerSource
-import org.jetbrains.kotlin.ir.descriptors.WrappedSimpleFunctionDescriptor
 import org.jetbrains.kotlin.ir.expressions.IrExpressionBody
 import org.jetbrains.kotlin.ir.expressions.IrFunctionExpression
 import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin
@@ -194,16 +191,11 @@ inline fun IrProperty.addSetter(builder: IrFunctionBuilder.() -> Unit = {}): IrS
 
 @PublishedApi
 internal fun IrFactory.buildFunction(builder: IrFunctionBuilder): IrSimpleFunction = with(builder) {
-  val wrappedDescriptor = if (originalDeclaration is IrLazyFunction || containerSource != null)
-    WrappedFunctionDescriptorWithContainerSource()
-  else WrappedSimpleFunctionDescriptor()
   createFunction(
     startOffset, endOffset, origin,
-    IrSimpleFunctionSymbolImpl(wrappedDescriptor),
+    IrSimpleFunctionSymbolImpl(),
     name, visibility, modality, returnType,
     isInline, isExternal, isTailrec, isSuspend, isOperator, isInfix, isExpect, isFakeOverride,
     containerSource
-  ).also {
-    wrappedDescriptor.bind(it)
-  }
+  )
 }

kotlin-react-function-plugin/src/test/kotlin/com/bnorm/react/JsCompile.kt

@@ -15,7 +15,6 @@ fun compile(
   val result = KotlinJsCompilation().apply {
     sources = listOf(SourceFile.kotlin("main.kt", source, trimIndent = false))
     irProduceJs = true
-    irProduceKlibFile = true
     messageOutputStream = System.out
     compilerPlugins = plugins.toList()
     kotlincArguments = listOf(

sample/build.gradle.kts

@@ -1,14 +1,12 @@
 plugins {
-  kotlin("js") version "1.4.30"
-  kotlin("plugin.serialization") version "1.4.30"
+  kotlin("js") version "1.5.0"
+  kotlin("plugin.serialization") version "1.5.0"
   id("com.bnorm.react.kotlin-react-function") version "0.4.0"
 }
 
 repositories {
   mavenCentral()
-  jcenter()
-  maven { setUrl("https://kotlin.bintray.com/kotlinx") }
-  maven { setUrl("https://dl.bintray.com/kotlin/kotlin-js-wrappers") }
+  maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers")
 }
 
 kotlin {
@@ -19,13 +17,12 @@ kotlin {
 }
 
 dependencies {
-  implementation(kotlin("stdlib-js"))
-  implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1")
-  implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.1.1")
+  implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.2.0")
+  implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.2.0")
 
   implementation("com.bnorm.react:kotlin-react-function:0.3.0")
-  implementation("org.jetbrains:kotlin-react-dom:17.0.1-pre.144-kotlin-1.4.21")
-  implementation("org.jetbrains:kotlin-styled:5.2.0-pre.144-kotlin-1.4.21")
+  implementation("org.jetbrains:kotlin-react-dom:17.0.2-pre.154-kotlin-1.5.0")
+  implementation("org.jetbrains:kotlin-styled:5.2.3-pre.154-kotlin-1.5.0")
 
   implementation(npm("@reach/accordion", "^0.13.0"))
   implementation(npm("prop-types", "^15.6.2")) // Not sure why this is needed...