Skip to content

Commit 78a153a

Browse files
committed
Fixed older Kotlin versions
1 parent 6abdf34 commit 78a153a

File tree

9 files changed

+28
-3
lines changed

9 files changed

+28
-3
lines changed

compiler-plugin/compiler-plugin-backend/src/main/core/kotlinx/rpc/codegen/VersionSpecificApi.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.platform.TargetPlatform
1616

1717
interface VersionSpecificApi {
1818
fun isJs(platform: TargetPlatform?): Boolean
19+
fun isWasm(platform: TargetPlatform?): Boolean
1920

2021
fun referenceClass(context: IrPluginContext, packageName: String, name: String): IrClassSymbol?
2122

compiler-plugin/compiler-plugin-backend/src/main/core/kotlinx/rpc/codegen/extension/RPCIrContext.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import org.jetbrains.kotlin.ir.types.makeNullable
1616
import org.jetbrains.kotlin.ir.util.functions
1717
import org.jetbrains.kotlin.ir.util.isVararg
1818
import org.jetbrains.kotlin.ir.util.properties
19-
import org.jetbrains.kotlin.platform.isWasm
2019
import org.jetbrains.kotlin.platform.konan.isNative
2120
import org.jetbrains.kotlin.types.Variance
2221

@@ -133,7 +132,7 @@ internal class RPCIrContext(
133132
}
134133

135134
fun isWasmTarget(): Boolean {
136-
return pluginContext.platform.isWasm()
135+
return versionSpecificApi.isWasm(pluginContext.platform)
137136
}
138137

139138
val functions = Functions()

compiler-plugin/compiler-plugin-backend/src/main/latest/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,17 @@ import org.jetbrains.kotlin.name.FqName
2020
import org.jetbrains.kotlin.name.Name
2121
import org.jetbrains.kotlin.platform.TargetPlatform
2222
import org.jetbrains.kotlin.platform.isJs
23+
import org.jetbrains.kotlin.platform.isWasm
2324

2425
object VersionSpecificApiImpl : VersionSpecificApi {
2526
override fun isJs(platform: TargetPlatform?): Boolean {
2627
return platform.isJs()
2728
}
2829

30+
override fun isWasm(platform: TargetPlatform?): Boolean {
31+
return platform.isWasm()
32+
}
33+
2934
override var IrFieldBuilder.isFinalVS: Boolean
3035
get() = isFinal
3136
set(value) {

compiler-plugin/compiler-plugin-backend/src/main/v_1_7/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ object VersionSpecificApiImpl : VersionSpecificApi {
2222
override fun isJs(platform: TargetPlatform?): Boolean {
2323
return platform.isJs()
2424
}
25+
26+
override fun isWasm(platform: TargetPlatform?): Boolean = false
27+
2528
override var IrFieldBuilder.isFinalVS: Boolean
2629
get() = undefinedAPI()
2730
set(_) {}

compiler-plugin/compiler-plugin-backend/src/main/v_1_7_2/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ object VersionSpecificApiImpl : VersionSpecificApi {
2525
override fun isJs(platform: TargetPlatform?): Boolean {
2626
return platform.isJs()
2727
}
28+
29+
override fun isWasm(platform: TargetPlatform?): Boolean = false
30+
2831
override var IrFieldBuilder.isFinalVS: Boolean
2932
get() = undefinedAPI()
3033
set(_) {}

compiler-plugin/compiler-plugin-backend/src/main/v_1_8/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ object VersionSpecificApiImpl : VersionSpecificApi {
2626
override fun isJs(platform: TargetPlatform?): Boolean {
2727
return platform.isJs()
2828
}
29+
30+
override fun isWasm(platform: TargetPlatform?): Boolean = false
31+
2932
override var IrFieldBuilder.isFinalVS: Boolean
3033
get() = undefinedAPI()
3134
set(_) {}

compiler-plugin/compiler-plugin-backend/src/main/v_1_9/kotlinx/rpc/codegen/VersionSpecificApiImpl.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ object VersionSpecificApiImpl : VersionSpecificApi {
2828
return platform.isJs()
2929
}
3030

31+
override fun isWasm(platform: TargetPlatform?): Boolean = false
32+
3133
override var IrFieldBuilder.isFinalVS: Boolean
3234
get() = modality == Modality.FINAL
3335
set(value) {
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/*
2+
* Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
3+
*/
4+
5+
package util
6+
7+
fun ProjectKotlinConfig.configureWasm() {
8+
// do nothing
9+
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ distributionBase=GRADLE_USER_HOME
66
distributionPath=wrapper/dists
77
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
88
zipStoreBase=GRADLE_USER_HOME
9-
zipStorePath=wrapper/dists
9+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)