Fixed older Kotlin versions

Kotlin · Sep 23, 2024 · a0f2b22 · a0f2b22
1 parent 897d7dc
commit a0f2b22
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 3 deletions.
diff --git a/...er-plugin/compiler-plugin-backend/src/main/core/kotlinx/rpc/codegen/VersionSpecificApi.kt b/...er-plugin/compiler-plugin-backend/src/main/core/kotlinx/rpc/codegen/VersionSpecificApi.kt
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.platform.TargetPlatform
 
 interface VersionSpecificApi {
     fun isJs(platform: TargetPlatform?): Boolean
+    fun isWasm(platform: TargetPlatform?): Boolean
 
     fun referenceClass(context: IrPluginContext, packageName: String, name: String): IrClassSymbol?
 

diff --git a/...lugin/compiler-plugin-backend/src/main/core/kotlinx/rpc/codegen/extension/RPCIrContext.kt b/...lugin/compiler-plugin-backend/src/main/core/kotlinx/rpc/codegen/extension/RPCIrContext.kt
@@ -16,7 +16,6 @@ import org.jetbrains.kotlin.ir.types.makeNullable
 import org.jetbrains.kotlin.ir.util.functions
 import org.jetbrains.kotlin.ir.util.isVararg
 import org.jetbrains.kotlin.ir.util.properties
-import org.jetbrains.kotlin.platform.isWasm
 import org.jetbrains.kotlin.platform.konan.isNative
 import org.jetbrains.kotlin.types.Variance
 
@@ -133,7 +132,7 @@ internal class RPCIrContext(
     }
 
     fun isWasmTarget(): Boolean {
-        return pluginContext.platform.isWasm()
+        return versionSpecificApi.isWasm(pluginContext.platform)
     }
 
     val functions = Functions()

diff --git a/...gin/compiler-plugin-backend/src/main/latest/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt b/...gin/compiler-plugin-backend/src/main/latest/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt
@@ -20,12 +20,17 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.platform.TargetPlatform
 import org.jetbrains.kotlin.platform.isJs
+import org.jetbrains.kotlin.platform.isWasm
 
 object VersionSpecificApiImpl : VersionSpecificApi {
     override fun isJs(platform: TargetPlatform?): Boolean {
         return platform.isJs()
     }
 
+    override fun isWasm(platform: TargetPlatform?): Boolean {
+        return platform.isWasm()
+    }
+
     override var IrFieldBuilder.isFinalVS: Boolean
         get() = isFinal
         set(value) {

diff --git a/...ugin/compiler-plugin-backend/src/main/v_1_7/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt b/...ugin/compiler-plugin-backend/src/main/v_1_7/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt
@@ -22,6 +22,9 @@ object VersionSpecificApiImpl : VersionSpecificApi {
     override fun isJs(platform: TargetPlatform?): Boolean {
         return platform.isJs()
     }
+
+    override fun isWasm(platform: TargetPlatform?): Boolean = false
+
     override var IrFieldBuilder.isFinalVS: Boolean
         get() = undefinedAPI()
         set(_) {}

diff --git a/...in/compiler-plugin-backend/src/main/v_1_7_2/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt b/...in/compiler-plugin-backend/src/main/v_1_7_2/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt
@@ -25,6 +25,9 @@ object VersionSpecificApiImpl : VersionSpecificApi {
     override fun isJs(platform: TargetPlatform?): Boolean {
         return platform.isJs()
     }
+
+    override fun isWasm(platform: TargetPlatform?): Boolean = false
+
     override var IrFieldBuilder.isFinalVS: Boolean
         get() = undefinedAPI()
         set(_) {}

diff --git a/...ugin/compiler-plugin-backend/src/main/v_1_8/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt b/...ugin/compiler-plugin-backend/src/main/v_1_8/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt
@@ -26,6 +26,9 @@ object VersionSpecificApiImpl : VersionSpecificApi {
     override fun isJs(platform: TargetPlatform?): Boolean {
         return platform.isJs()
     }
+
+    override fun isWasm(platform: TargetPlatform?): Boolean = false
+
     override var IrFieldBuilder.isFinalVS: Boolean
         get() = undefinedAPI()
         set(_) {}

diff --git a/...ugin/compiler-plugin-backend/src/main/v_1_9/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt b/...ugin/compiler-plugin-backend/src/main/v_1_9/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt
@@ -28,6 +28,8 @@ object VersionSpecificApiImpl : VersionSpecificApi {
         return platform.isJs()
     }
 
+    override fun isWasm(platform: TargetPlatform?): Boolean = false
+
     override var IrFieldBuilder.isFinalVS: Boolean
         get() = modality == Modality.FINAL
         set(value) {

diff --git a/gradle-conventions/src/main/pre_1_9_20/util/wasm.kt b/gradle-conventions/src/main/pre_1_9_20/util/wasm.kt
@@ -0,0 +1,9 @@
+/*
+ * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package util
+
+fun ProjectKotlinConfig.configureWasm() {
+    // do nothing
+}
diff --git a/gradle-conventions/src/main/pre_1_9_25/util/contextReceivers.kt b/gradle-conventions/src/main/pre_1_9_25/util/contextReceivers.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package util
+
+import org.gradle.api.Project
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+
+fun Project.enableContextReceivers() {
+    withKotlinJvmExtension {
+        compilerOptions {
+            freeCompilerArgs.add("-Xcontext-receivers")
+        }
+    }
+
+    withKotlinKmpExtension {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+        compilerOptions {
+            freeCompilerArgs.add("-Xcontext-receivers")
+        }
+    }
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -6,4 +6,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists