Added 1.9.25 (KRPC-103) and 2.0.10 (KRPC-104) Kotlin Versions

README.md

@@ -7,7 +7,7 @@
 
 [![Kotlin Experimental](https://kotl.in/badges/experimental.svg)](https://kotlinlang.org/docs/components-stability.html)
 [![Official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
-[![Kotlin](https://img.shields.io/badge/kotlin-1.7.0--1.9.24-blue.svg?logo=kotlin)](http://kotlinlang.org)
+[![Kotlin](https://img.shields.io/badge/kotlin-1.7.0--2.0.10-blue.svg?logo=kotlin)](http://kotlinlang.org)
 [![GitHub License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)
 
 [//]: # ([![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
 - The `org.jetbrains.kotlinx.rpc.plugin` will set up BOM and code generation for targets in the project.
 - The `org.jetbrains.kotlinx.rpc.platform` will only set up BOM. It is useful when you want to split your app into modules, 
 and some of them will contain service declarations, thus using code generation, while others will only consume them.
-- The `com.google.devtools.ksp` is required by the library. Corresponding configurations will be set up automatically by `org.jetbrains.kotlinx.rpc.plugin` plugin.
 
 Example of plugins setup in a project's `build.gradle.kts`:
+```kotlin
+plugins {
+    kotlin("jvm") version "2.0.10"
+    kotlin("plugin.serialization") version "2.0.10"
+    id("org.jetbrains.kotlinx.rpc.plugin") version "0.2.2"
+}
+```
+
+For Kotlin versions prior to 2.0, 
+KSP plugin is required 
+(Corresponding configurations will be set up automatically by `org.jetbrains.kotlinx.rpc.plugin` plugin):
+
 ```kotlin
 // build.gradle.kts
 plugins {
-    kotlin("jvm") version "1.9.24"
-    kotlin("plugin.serialization") version "1.9.24"
-    id("com.google.devtools.ksp") version "1.9.24-1.0.20"
+    kotlin("jvm") version "1.9.25"
+    kotlin("plugin.serialization") version "1.9.25"
+    id("com.google.devtools.ksp") version "1.9.25-1.0.20"
     id("org.jetbrains.kotlinx.rpc.plugin") version "0.2.2"
 }
 ```
@@ -147,13 +158,14 @@ Integrations in progress:
 We support all stable Kotlin versions starting from 1.7.0:
 - 1.7.0, 1.7.10, 1.7.20, 1.7.21, 1.7.22
 - 1.8.0, 1.8.10, 1.8.20, 1.8.21, 1.8.22
-- 1.9.0, 1.9.10, 1.9.20, 1.9.21, 1.9.22, 1.9.23, 1.9.24
+- 1.9.0, 1.9.10, 1.9.20, 1.9.21, 1.9.22, 1.9.23, 1.9.24, 1.9.25
+- 2.0.0, 2.0.10
 
 To simplify project configuration, our Gradle plugin sets a proper library version automatically using BOM, 
 based on the project's Kotlin version:
 ```kotlin
 plugins {
-    kotlin("jvm") version "1.9.24"
+    kotlin("jvm") version "2.0.10"
     id("org.jetbrains.kotlinx.rpc.plugin") version "0.2.2"
 }
 

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

@@ -96,9 +96,9 @@
             </p>
             <code-block lang="kotlin">
                 plugins {
-                    kotlin("jvm") version "1.9.24"
+                    kotlin("jvm") version "1.9.25"
                     id("org.jetbrains.kotlinx.rpc.plugin") version "%kotlinx-rpc-version%"
-                    id("com.google.devtools.ksp") version "1.9.24-1.0.20"
+                    id("com.google.devtools.ksp") version "1.9.25-1.0.20"
                 }
             </code-block>
         </chapter>

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

@@ -23,7 +23,8 @@
         <list>
             <li>1.7.0, 1.7.10, 1.7.20, 1.7.21, 1.7.22</li>
             <li>1.8.0, 1.8.10, 1.8.20, 1.8.21, 1.8.22</li>
-            <li>1.9.0, 1.9.10, 1.9.20, 1.9.21, 1.9.22, 1.9.23, 1.9.24</li>
+            <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>
+            <li>2.0.0, 2.0.10</li>
         </list>
         <p>
             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

@@ -15,6 +15,6 @@
 
     <!--  Library versions  -->
     <var name="kotlinx-rpc-version" value="0.2.2"/>
-    <var name="kotlin-version" value="1.9.24"/>
-    <var name="ksp-version" value="1.9.24-1.0.20"/>
+    <var name="kotlin-version" value="2.0.10"/>
+    <var name="ksp-version" value="1.9.25-1.0.20"/>
 </vars>

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

@@ -29,7 +29,7 @@ fun filterSourceDirsForCSM(sourceSetPath: Path): List<File> {
 // It's ok to have version '1'.
 // For example, we may have '1.7' and '1' specific source sets.
 // That would mean that all 1.7.* versions we compile with the '1.7' source set,
-// and 1.8.+ up to 1.9.24 will be with the '1' source set
+// and 1.8.+ up to 1.9.25 will be with the '1' source set
 class CompilerModuleVersion(fullName: String, prefix: String) : Comparable<CompilerModuleVersion> {
     // For example, "v_1_7_10" -> "1.7.10"
     val version = fullName

versions-root/kotlin-versions-lookup.csv

@@ -1,5 +1,7 @@
 Kotlin,ksp,atomicfu,serialization,detekt-gradle-plugin,gradle-kotlin-dsl,binary-compatibility-validator,kover
+2.0.10,1.0.24,0.22.0,1.6.1,1.23.6,4.3.0,0.14.0,0.8.0
 2.0.0,1.0.23,0.22.0,1.6.1,1.23.6,4.3.0,0.14.0,0.8.0
+1.9.25,1.0.20,0.22.0,1.6.1,1.23.6,4.1.0,0.14.0,0.8.0
 1.9.24,1.0.20,0.22.0,1.6.1,1.23.6,4.1.0,0.14.0,0.8.0
 1.9.23,1.0.19,0.22.0,1.6.1,1.23.6,4.1.0,0.14.0,0.8.0
 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

@@ -3,7 +3,7 @@
 kotlinx-rpc = "0.2.2"
 
 # kotlin
-kotlin-lang = "2.0.0"
+kotlin-lang = "2.0.10"
 
 # kotlin independent versions
 detekt-analyzer = "1.23.6"