Skip to content

Commit 330c846

Browse files
committed
Upgrade to 2.1.0 (#242)
1 parent da5f363 commit 330c846

File tree

7 files changed

+31
-40
lines changed

7 files changed

+31
-40
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ that will set up code generation in a project.
9090
Example of a setup in a project's `build.gradle.kts`:
9191
```kotlin
9292
plugins {
93-
kotlin("multiplatform") version "2.0.21"
94-
kotlin("plugin.serialization") version "2.0.21"
93+
kotlin("multiplatform") version "2.1.0"
94+
kotlin("plugin.serialization") version "2.1.0"
9595
id("org.jetbrains.kotlinx.rpc.plugin") version "0.4.0"
9696
}
9797
```
@@ -143,7 +143,7 @@ Integrations in progress:
143143

144144
## Kotlin compatibility
145145
We support all stable Kotlin versions starting from 2.0.0:
146-
- 2.0.0, 2.0.10, 2.0.20, 2.0.21
146+
- 2.0.0, 2.0.10, 2.0.20, 2.0.21, 2.1.0
147147

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

compiler-plugin/compiler-plugin-k2/src/main/latest/kotlinx/rpc/codegen/FirVersionSpecificApiImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ package kotlinx.rpc.codegen
66

77
import org.jetbrains.kotlin.KtSourceElement
88
import org.jetbrains.kotlin.fir.FirSession
9+
import org.jetbrains.kotlin.fir.resolve.toClassSymbol
910
import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
1011
import org.jetbrains.kotlin.fir.toFirResolvedTypeRef
1112
import org.jetbrains.kotlin.fir.types.ConeKotlinType
1213
import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
1314
import org.jetbrains.kotlin.fir.types.FirTypeRef
1415
import org.jetbrains.kotlin.fir.types.builder.FirResolvedTypeRefBuilder
15-
import org.jetbrains.kotlin.fir.types.toClassSymbol
1616

1717
@Suppress("unused")
1818
object FirVersionSpecificApiImpl : FirVersionSpecificApi {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
the following versions of Kotlin are supported:
2222
</p>
2323
<list>
24-
<li>2.0.0, 2.0.10, 2.0.20, 2.0.21</li>
24+
<li>2.0.0, 2.0.10, 2.0.20, 2.0.21, 2.1.0</li>
2525
</list>
2626
<p>
2727
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.4.0"/>
18-
<var name="kotlin-version" value="2.0.21"/>
18+
<var name="kotlin-version" value="2.1.0"/>
1919
</vars>

kotlin-js-store/yarn.lock

Lines changed: 23 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -102,28 +102,12 @@
102102
dependencies:
103103
"@types/node" "*"
104104

105-
"@types/eslint-scope@^3.7.3":
106-
version "3.7.7"
107-
resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
108-
integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
109-
dependencies:
110-
"@types/eslint" "*"
111-
"@types/estree" "*"
112-
113-
"@types/eslint@*":
114-
version "9.6.1"
115-
resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584"
116-
integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==
117-
dependencies:
118-
"@types/estree" "*"
119-
"@types/json-schema" "*"
120-
121-
"@types/estree@*", "@types/estree@^1.0.5":
105+
"@types/estree@^1.0.5":
122106
version "1.0.6"
123107
resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
124108
integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
125109

126-
"@types/json-schema@*", "@types/json-schema@^7.0.8":
110+
"@types/json-schema@^7.0.8":
127111
version "7.0.15"
128112
resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
129113
integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -810,7 +794,7 @@ engine.io@~6.6.0:
810794
engine.io-parser "~5.2.1"
811795
ws "~8.17.1"
812796

813-
enhanced-resolve@^5.17.0:
797+
enhanced-resolve@^5.17.1:
814798
version "5.17.1"
815799
resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
816800
integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
@@ -1428,10 +1412,10 @@ [email protected]:
14281412
minimatch "^9.0.3"
14291413
webpack-merge "^4.1.5"
14301414

1431-
1432-
version "6.4.3"
1433-
resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/karma/-/karma-6.4.3.tgz#763e500f99597218bbb536de1a14acc4ceea7ce8"
1434-
integrity sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==
1415+
1416+
version "6.4.4"
1417+
resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492"
1418+
integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==
14351419
dependencies:
14361420
"@colors/colors" "1.5.0"
14371421
body-parser "^1.19.0"
@@ -1463,6 +1447,13 @@ kind-of@^6.0.2:
14631447
resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
14641448
integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
14651449

1450+
1451+
version "2.0.0"
1452+
resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286"
1453+
integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw==
1454+
dependencies:
1455+
format-util "^1.0.5"
1456+
14661457
lines-and-columns@^1.1.6:
14671458
version "1.2.4"
14681459
resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
@@ -1581,10 +1572,10 @@ mkdirp@^0.5.5:
15811572
dependencies:
15821573
minimist "^1.2.6"
15831574

1584-
1585-
version "10.7.0"
1586-
resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/mocha/-/mocha-10.7.0.tgz#9e5cbed8fa9b37537a25bd1f7fb4f6fc45458b9a"
1587-
integrity sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==
1575+
1576+
version "10.7.3"
1577+
resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/mocha/-/mocha-10.7.3.tgz#ae32003cabbd52b59aece17846056a68eb4b0752"
1578+
integrity sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==
15881579
dependencies:
15891580
ansi-colors "^4.1.3"
15901581
browser-stdout "^1.3.1"
@@ -2400,12 +2391,11 @@ webpack-sources@^3.2.3:
24002391
resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
24012392
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
24022393

2403-
webpack@5.93.0:
2404-
version "5.93.0"
2405-
resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5"
2406-
integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==
2394+
webpack@5.94.0:
2395+
version "5.94.0"
2396+
resolved "https://packages.jetbrains.team/npm/p/krpc/build-deps/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"
2397+
integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==
24072398
dependencies:
2408-
"@types/eslint-scope" "^3.7.3"
24092399
"@types/estree" "^1.0.5"
24102400
"@webassemblyjs/ast" "^1.12.1"
24112401
"@webassemblyjs/wasm-edit" "^1.12.1"
@@ -2414,7 +2404,7 @@ [email protected]:
24142404
acorn-import-attributes "^1.9.5"
24152405
browserslist "^4.21.10"
24162406
chrome-trace-event "^1.0.2"
2417-
enhanced-resolve "^5.17.0"
2407+
enhanced-resolve "^5.17.1"
24182408
es-module-lexer "^1.2.1"
24192409
eslint-scope "5.1.1"
24202410
events "^3.2.0"

versions-root/kotlin-versions-lookup.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
Kotlin,atomicfu,serialization,detekt-gradle-plugin,gradle-kotlin-dsl,binary-compatibility-validator,kover
2+
2.1.0,0.26.0,1.7.3,1.23.7,5.1.2,0.16.3,0.8.3
23
2.0.21,0.26.0,1.7.3,1.23.7,5.1.2,0.16.3,0.8.3
34
2.0.20,0.26.0,1.7.3,1.23.7,5.1.2,0.16.3,0.8.3
45
2.0.10,0.26.0,1.7.1,1.23.7,5.1.2,0.16.3,0.8.3

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.5.0-SNAPSHOT"
44

55
# kotlin
6-
kotlin-lang = "2.0.21" # or env.KOTLIN_VERSION
6+
kotlin-lang = "2.1.0" # or env.KOTLIN_VERSION
77
kotlin-compiler = "0.0.0" # default to kotlin-lang or env.KOTLIN_COMPILER_VERSION
88

99
# kotlin independent versions

0 commit comments

Comments
 (0)