Skip to content

Commit 790a1f3

Browse files
authored
Added 1.9.25 and 2.0.10 Kotlin Versions (#168)
1 parent 07d7e88 commit 790a1f3

File tree

7 files changed

+29
-14
lines changed

7 files changed

+29
-14
lines changed

README.md

Lines changed: 19 additions & 7 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-1.7.0--1.9.24-blue.svg?logo=kotlin)](http://kotlinlang.org)
10+
[![Kotlin](https://img.shields.io/badge/kotlin-1.7.0--2.0.10-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))
@@ -86,15 +86,26 @@ Check out our [getting started guide](https://kotlin.github.io/kotlinx-rpc) for
8686
- The `org.jetbrains.kotlinx.rpc.plugin` will set up BOM and code generation for targets in the project.
8787
- The `org.jetbrains.kotlinx.rpc.platform` will only set up BOM. It is useful when you want to split your app into modules,
8888
and some of them will contain service declarations, thus using code generation, while others will only consume them.
89-
- The `com.google.devtools.ksp` is required by the library. Corresponding configurations will be set up automatically by `org.jetbrains.kotlinx.rpc.plugin` plugin.
9089

9190
Example of plugins setup in a project's `build.gradle.kts`:
91+
```kotlin
92+
plugins {
93+
kotlin("jvm") version "2.0.10"
94+
kotlin("plugin.serialization") version "2.0.10"
95+
id("org.jetbrains.kotlinx.rpc.plugin") version "0.2.2"
96+
}
97+
```
98+
99+
For Kotlin versions prior to 2.0,
100+
KSP plugin is required
101+
(Corresponding configurations will be set up automatically by `org.jetbrains.kotlinx.rpc.plugin` plugin):
102+
92103
```kotlin
93104
// build.gradle.kts
94105
plugins {
95-
kotlin("jvm") version "1.9.24"
96-
kotlin("plugin.serialization") version "1.9.24"
97-
id("com.google.devtools.ksp") version "1.9.24-1.0.20"
106+
kotlin("jvm") version "1.9.25"
107+
kotlin("plugin.serialization") version "1.9.25"
108+
id("com.google.devtools.ksp") version "1.9.25-1.0.20"
98109
id("org.jetbrains.kotlinx.rpc.plugin") version "0.2.2"
99110
}
100111
```
@@ -147,13 +158,14 @@ Integrations in progress:
147158
We support all stable Kotlin versions starting from 1.7.0:
148159
- 1.7.0, 1.7.10, 1.7.20, 1.7.21, 1.7.22
149160
- 1.8.0, 1.8.10, 1.8.20, 1.8.21, 1.8.22
150-
- 1.9.0, 1.9.10, 1.9.20, 1.9.21, 1.9.22, 1.9.23, 1.9.24
161+
- 1.9.0, 1.9.10, 1.9.20, 1.9.21, 1.9.22, 1.9.23, 1.9.24, 1.9.25
162+
- 2.0.0, 2.0.10
151163

152164
To simplify project configuration, our Gradle plugin sets a proper library version automatically using BOM,
153165
based on the project's Kotlin version:
154166
```kotlin
155167
plugins {
156-
kotlin("jvm") version "1.9.24"
168+
kotlin("jvm") version "2.0.10"
157169
id("org.jetbrains.kotlinx.rpc.plugin") version "0.2.2"
158170
}
159171

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@
9696
</p>
9797
<code-block lang="kotlin">
9898
plugins {
99-
kotlin("jvm") version "1.9.24"
99+
kotlin("jvm") version "1.9.25"
100100
id("org.jetbrains.kotlinx.rpc.plugin") version "%kotlinx-rpc-version%"
101-
id("com.google.devtools.ksp") version "1.9.24-1.0.20"
101+
id("com.google.devtools.ksp") version "1.9.25-1.0.20"
102102
}
103103
</code-block>
104104
</chapter>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
<list>
2424
<li>1.7.0, 1.7.10, 1.7.20, 1.7.21, 1.7.22</li>
2525
<li>1.8.0, 1.8.10, 1.8.20, 1.8.21, 1.8.22</li>
26-
<li>1.9.0, 1.9.10, 1.9.20, 1.9.21, 1.9.22, 1.9.23, 1.9.24</li>
26+
<li>1.9.0, 1.9.10, 1.9.20, 1.9.21, 1.9.22, 1.9.23, 1.9.24, 1.9.25</li>
27+
<li>2.0.0, 2.0.10</li>
2728
</list>
2829
<p>
2930
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515

1616
<!-- Library versions -->
1717
<var name="kotlinx-rpc-version" value="0.2.2"/>
18-
<var name="kotlin-version" value="1.9.24"/>
19-
<var name="ksp-version" value="1.9.24-1.0.20"/>
18+
<var name="kotlin-version" value="2.0.10"/>
19+
<var name="ksp-version" value="1.9.25-1.0.20"/>
2020
</vars>

gradle-conventions-settings/src/main/kotlin/util/KotlinVersion.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fun filterSourceDirsForCSM(sourceSetPath: Path): List<File> {
2929
// It's ok to have version '1'.
3030
// For example, we may have '1.7' and '1' specific source sets.
3131
// That would mean that all 1.7.* versions we compile with the '1.7' source set,
32-
// and 1.8.+ up to 1.9.24 will be with the '1' source set
32+
// and 1.8.+ up to 1.9.25 will be with the '1' source set
3333
class CompilerModuleVersion(fullName: String, prefix: String) : Comparable<CompilerModuleVersion> {
3434
// For example, "v_1_7_10" -> "1.7.10"
3535
val version = fullName

versions-root/kotlin-versions-lookup.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
Kotlin,ksp,atomicfu,serialization,detekt-gradle-plugin,gradle-kotlin-dsl,binary-compatibility-validator,kover
2+
2.0.10,1.0.24,0.22.0,1.6.1,1.23.6,4.3.0,0.14.0,0.8.0
23
2.0.0,1.0.23,0.22.0,1.6.1,1.23.6,4.3.0,0.14.0,0.8.0
4+
1.9.25,1.0.20,0.22.0,1.6.1,1.23.6,4.1.0,0.14.0,0.8.0
35
1.9.24,1.0.20,0.22.0,1.6.1,1.23.6,4.1.0,0.14.0,0.8.0
46
1.9.23,1.0.19,0.22.0,1.6.1,1.23.6,4.1.0,0.14.0,0.8.0
57
1.9.22,1.0.17,0.22.0,1.6.1,1.23.6,4.1.0,0.14.0,0.8.0

versions-root/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
kotlinx-rpc = "0.2.2"
44

55
# kotlin
6-
kotlin-lang = "2.0.0"
6+
kotlin-lang = "2.0.10"
77

88
# kotlin independent versions
99
detekt-analyzer = "1.23.6"

0 commit comments

Comments
 (0)