Skip to content

Commit ddeab6f

Browse files
authored
Kotlin 2.1.20 (#309)
* Kotlin 2.1.20 * Update tests
1 parent 94b711f commit ddeab6f

File tree

14 files changed

+116
-104
lines changed

14 files changed

+116
-104
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
[![Kotlin Experimental](https://kotl.in/badges/experimental.svg)](https://kotlinlang.org/docs/components-stability.html)
99
[![Official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
10-
[![Kotlin](https://img.shields.io/badge/kotlin-2.0.0--2.0.21-blue.svg?logo=kotlin)](http://kotlinlang.org)
10+
[![Kotlin](https://img.shields.io/badge/kotlin-2.0.0--2.1.20-blue.svg?logo=kotlin)](http://kotlinlang.org)
1111
[![GitHub License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)
1212

1313
[//]: # ([![TeamCity build](https://img.shields.io/teamcity/build/s/Build_kRPC_All.svg?server=http%3A%2F%2Fkrpc.teamcity.com)](https://teamcity.jetbrains.com/viewType.html?buildTypeId=Build_kRPC_All&guest=1))
@@ -114,8 +114,8 @@ that will set up code generation in a project.
114114
Example of a setup in a project's `build.gradle.kts`:
115115
```kotlin
116116
plugins {
117-
kotlin("multiplatform") version "2.1.10"
118-
kotlin("plugin.serialization") version "2.1.10"
117+
kotlin("multiplatform") version "2.1.20"
118+
kotlin("plugin.serialization") version "2.1.20"
119119
id("org.jetbrains.kotlinx.rpc.plugin") version "0.5.1"
120120
}
121121
```
@@ -177,7 +177,7 @@ For a working example, see the [sample gRPC project](/samples/grpc-app).
177177
## Kotlin compatibility
178178
We support all stable Kotlin versions starting from 2.0.0:
179179
- 2.0.0, 2.0.10, 2.0.20, 2.0.21
180-
- 2.1.0, 2.1.10
180+
- 2.1.0, 2.1.10, 2.1.20
181181

182182
For a full compatibility checklist,
183183
see [Versions](https://kotlin.github.io/kotlinx-rpc/versions.html).

docs/pages/kotlinx-rpc/topics/versions.topic

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</p>
2323
<list>
2424
<li>2.0.0, 2.0.10, 2.0.20, 2.0.21</li>
25-
<li>2.1.0, 2.1.10</li>
25+
<li>2.1.0, 2.1.10, 2.1.20</li>
2626
</list>
2727
<p>
2828
Our code generation will support these versions (See more on <a anchor="code-generation-artifacts">code generation artifacts</a>).

docs/pages/kotlinx-rpc/v.list

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515

1616
<!-- Library versions -->
1717
<var name="kotlinx-rpc-version" value="0.5.1"/>
18-
<var name="kotlin-version" value="2.1.10"/>
18+
<var name="kotlin-version" value="2.1.20"/>
1919
</vars>

tests/compiler-plugin-tests/src/test/kotlin/kotlinx/rpc/codegen/test/runners/AbstractBoxTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
2+
* Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
33
*/
44

55
package kotlinx.rpc.codegen.test.runners
@@ -36,7 +36,7 @@ open class AbstractBoxTest : BaseTestRunner(), RunnerWithTargetBackendForTestGen
3636
override val targetBackend: TargetBackend
3737
get() = TargetBackend.JVM_IR
3838

39-
override fun TestConfigurationBuilder.configuration() {
39+
override fun configure(builder: TestConfigurationBuilder) = with(builder) {
4040
configureFirParser(FirParser.LightTree)
4141

4242
defaultDirectives {

tests/compiler-plugin-tests/src/test/kotlin/kotlinx/rpc/codegen/test/runners/AbstractDiagnosticTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
2+
* Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
33
*/
44

55
package kotlinx.rpc.codegen.test.runners
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.test.services.EnvironmentBasedStandardLibrariesPathP
1111
import org.jetbrains.kotlin.test.services.KotlinStandardLibrariesPathProvider
1212

1313
abstract class AbstractDiagnosticTest : BaseTestRunner() {
14-
override fun TestConfigurationBuilder.configuration() {
14+
override fun configure(builder: TestConfigurationBuilder) = with(builder) {
1515
commonFirWithPluginFrontendConfiguration()
1616
configureFirParser(FirParser.LightTree)
1717
}

tests/compiler-plugin-tests/src/test/kotlin/kotlinx/rpc/codegen/test/runners/BaseTestRunner.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
2+
* Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
33
*/
44

55
package kotlinx.rpc.codegen.test.runners
@@ -8,11 +8,11 @@ import kotlinx.rpc.codegen.test.services.ExtensionRegistrarConfigurator
88
import kotlinx.rpc.codegen.test.services.RpcCompileClasspathProvider
99
import kotlinx.rpc.codegen.test.services.RpcRuntimeClasspathProvider
1010
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
11+
import org.jetbrains.kotlin.test.configuration.baseFirDiagnosticTestConfiguration
1112
import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives
1213
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
1314
import org.jetbrains.kotlin.test.initIdeaConfiguration
1415
import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerTest
15-
import org.jetbrains.kotlin.test.runners.baseFirDiagnosticTestConfiguration
1616
import org.jetbrains.kotlin.test.services.EnvironmentBasedStandardLibrariesPathProvider
1717
import org.jetbrains.kotlin.test.services.KotlinStandardLibrariesPathProvider
1818
import org.junit.jupiter.api.BeforeAll

0 commit comments

Comments
 (0)