From dcd99effdb4b2a7671bef6e146e12dbcc8a7291c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Jun 2025 10:19:57 +0000 Subject: [PATCH 1/8] Update Python Monitor Dependencies --- monitor/requirements.txt | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/monitor/requirements.txt b/monitor/requirements.txt index 8e5b39d68..7a42ef277 100644 --- a/monitor/requirements.txt +++ b/monitor/requirements.txt @@ -1,16 +1,16 @@ aiohappyeyeballs==2.6.1 -aiohttp==3.11.16 +aiohttp==3.12.13 aiohttp-jinja2==1.6 aiosignal==1.3.2 anyio==4.9.0 async-timeout==5.0.1 attrs==25.3.0 -certifi==2025.1.31 -click==8.1.8 -exceptiongroup==1.2.2 -frozenlist==1.5.0 +certifi==2025.6.15 +click==8.2.1 +exceptiongroup==1.3.0 +frozenlist==1.7.0 h11==0.14.0 -httpcore==1.0.7 +httpcore==1.0.9 httpx==0.28.1 idna==3.10 Jinja2==3.1.6 @@ -19,16 +19,16 @@ markdown-it-py==3.0.0 MarkupSafe==3.0.2 mdit-py-plugins==0.4.2 mdurl==0.1.2 -msgpack==1.1.0 -multidict==6.4.2 -platformdirs==4.3.7 -propcache==0.3.1 -Pygments==2.19.1 +msgpack==1.1.1 +multidict==6.6.0 +platformdirs==4.3.8 +propcache==0.3.2 +Pygments==2.19.2 rich==14.0.0 sniffio==1.3.1 -textual==3.0.1 +textual==3.5.0 textual-dev==1.7.0 -textual-serve==1.1.1 -typing_extensions==4.13.1 +textual-serve==1.1.2 +typing_extensions==4.14.0 uc-micro-py==1.0.3 -yarl==1.19.0 +yarl==1.20.1 From 02a40e8483c840b1bfc8970e125ee0060a16f966 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 26 Jun 2025 06:57:57 +0000 Subject: [PATCH 2/8] Update dependency h11 to v0.16.0 [SECURITY] --- monitor/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitor/requirements.txt b/monitor/requirements.txt index 7a42ef277..b7de72a12 100644 --- a/monitor/requirements.txt +++ b/monitor/requirements.txt @@ -9,7 +9,7 @@ certifi==2025.6.15 click==8.2.1 exceptiongroup==1.3.0 frozenlist==1.7.0 -h11==0.14.0 +h11==0.16.0 httpcore==1.0.9 httpx==0.28.1 idna==3.10 From e88ebe2b199d5b681b1346a09aa3eb46477b682c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 18:16:35 +0000 Subject: [PATCH 3/8] Update plugin org.gradle.toolchains.foojay-resolver-convention to v1 --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 89cfb8408..9c8dee01a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -19,7 +19,7 @@ plugins { id("conventions-repositories") id("conventions-version-resolution") id("conventions-develocity") - id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" } dependencyResolutionManagement { From 3db5f4023b174308202abb29a5cb1c32f31ecc45 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 25 Jun 2025 10:15:50 +0000 Subject: [PATCH 4/8] Update gradle/actions action to v4 --- .github/workflows/docs.yml | 2 +- .github/workflows/platforms.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 6eae1282f..00a0a7252 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -81,7 +81,7 @@ jobs: fetch-depth: 0 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 - name: Run Dokka run: ./gradlew dokkaGenerate diff --git a/.github/workflows/platforms.yml b/.github/workflows/platforms.yml index a9082bcd3..ec703c54a 100644 --- a/.github/workflows/platforms.yml +++ b/.github/workflows/platforms.yml @@ -14,6 +14,6 @@ jobs: - name: Checkout Sources uses: actions/checkout@v4 - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 - name: Check Platforms Table run: ./gradlew verifyPlatformTable --no-configuration-cache From df0584669a84e067828ee5f6b854d83f64f369e5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 26 Jun 2025 06:58:09 +0000 Subject: [PATCH 5/8] Update Core dependencies (non-major) --- versions-root/libs.versions.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/versions-root/libs.versions.toml b/versions-root/libs.versions.toml index fea2bcecb..0f7f580dd 100644 --- a/versions-root/libs.versions.toml +++ b/versions-root/libs.versions.toml @@ -9,25 +9,25 @@ kotlin-compiler = "0.0.0" # default to kotlin-lang or env.KOTLIN_COMPILER_VERSIO # kotlin independent versions detekt-analyzer = "1.23.6" coroutines = "1.10.2" -ktor = "3.1.2" -kotlin-logging = "7.0.6" +ktor = "3.2.0" +kotlin-logging = "7.0.7" slf4j = "2.0.17" logback = "1.3.14" gradle-plugin-publish = "1.3.1" -kotlin-wrappers = "2025.4.8" +kotlin-wrappers = "2025.6.11" junit4 = "4.13.2" -junit5 = "5.12.1" +junit5 = "5.13.2" intellij = "241.19416.19" -gradle-doctor = "0.10.0" +gradle-doctor = "0.11.0" kotlinx-browser = "0.3" dokka = "2.0.0" puppeteer = "24.9.0" -atomicfu = "0.27.0" +atomicfu = "0.29.0" serialization = "1.8.1" detekt-gradle-plugin = "1.23.8" kover = "0.9.1" develocity = "3.19.2" -common-custom-user-data = "2.2.1" +common-custom-user-data = "2.3" [libraries] # kotlinx.rpc – references to the included builds From a996c64c7f2c2b18d30c409dd3bf8709181e9322 Mon Sep 17 00:00:00 2001 From: Alexander Sysoev Date: Fri, 27 Jun 2025 16:11:49 +0200 Subject: [PATCH 6/8] Updated locks --- kotlin-js-store/package-lock.json | 14 +++++++++++--- kotlin-js-store/wasm/package-lock.json | 14 +++++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/kotlin-js-store/package-lock.json b/kotlin-js-store/package-lock.json index 3415a64f2..a58ae0d02 100644 --- a/kotlin-js-store/package-lock.json +++ b/kotlin-js-store/package-lock.json @@ -36,7 +36,7 @@ "packages/kotlinx-rpc-krpc-krpc-serialization-krpc-serialization-json-test", "packages/kotlinx-rpc-krpc-krpc-serialization-krpc-serialization-protobuf", "packages/kotlinx-rpc-krpc-krpc-serialization-krpc-serialization-protobuf-test", - "packages_imported/ktor-ktor-client-ktor-client-core/3.1.2" + "packages_imported/ktor-ktor-client-core/3.2.0" ], "devDependencies": {} }, @@ -2490,8 +2490,8 @@ "resolved": "packages/kotlinx-rpc-utils-test", "link": true }, - "node_modules/ktor-ktor-client-ktor-client-core": { - "resolved": "packages_imported/ktor-ktor-client-ktor-client-core/3.1.2", + "node_modules/ktor-ktor-client-core": { + "resolved": "packages_imported/ktor-ktor-client-core/3.2.0", "link": true }, "node_modules/lines-and-columns": { @@ -4406,9 +4406,17 @@ "resolved": "https://packages.jetbrains.team/npm/p/krpc/build-deps/zod/-/zod-3.25.67.tgz", "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==" }, + "packages_imported/ktor-ktor-client-core/3.2.0": { + "version": "3.2.0", + "dependencies": { + "ws": "8.18.0" + }, + "devDependencies": {} + }, "packages_imported/ktor-ktor-client-ktor-client-core/3.1.2": { "name": "ktor-ktor-client-ktor-client-core", "version": "3.1.2", + "extraneous": true, "dependencies": { "ws": "8.18.0" }, diff --git a/kotlin-js-store/wasm/package-lock.json b/kotlin-js-store/wasm/package-lock.json index 44f3782d5..75d47c3e6 100644 --- a/kotlin-js-store/wasm/package-lock.json +++ b/kotlin-js-store/wasm/package-lock.json @@ -36,7 +36,7 @@ "packages/kotlinx-rpc-krpc-krpc-serialization-krpc-serialization-json-test", "packages/kotlinx-rpc-krpc-krpc-serialization-krpc-serialization-protobuf", "packages/kotlinx-rpc-krpc-krpc-serialization-krpc-serialization-protobuf-test", - "packages_imported/ktor-ktor-client-ktor-client-core-wasm-js/3.1.2" + "packages_imported/ktor-ktor-client-core-wasm-js/3.2.0" ], "devDependencies": {} }, @@ -2490,8 +2490,8 @@ "resolved": "packages/kotlinx-rpc-utils-test", "link": true }, - "node_modules/ktor-ktor-client-ktor-client-core-wasm-js": { - "resolved": "packages_imported/ktor-ktor-client-ktor-client-core-wasm-js/3.1.2", + "node_modules/ktor-ktor-client-core-wasm-js": { + "resolved": "packages_imported/ktor-ktor-client-core-wasm-js/3.2.0", "link": true }, "node_modules/lines-and-columns": { @@ -4406,9 +4406,17 @@ "resolved": "https://packages.jetbrains.team/npm/p/krpc/build-deps/zod/-/zod-3.25.67.tgz", "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==" }, + "packages_imported/ktor-ktor-client-core-wasm-js/3.2.0": { + "version": "3.2.0", + "dependencies": { + "ws": "8.18.0" + }, + "devDependencies": {} + }, "packages_imported/ktor-ktor-client-ktor-client-core-wasm-js/3.1.2": { "name": "ktor-ktor-client-ktor-client-core-wasm-js", "version": "3.1.2", + "extraneous": true, "dependencies": { "ws": "8.18.0" }, From 44fbb6fcf3da1b396d96934021e510d8ce76d5e8 Mon Sep 17 00:00:00 2001 From: Alexander Sysoev Date: Sun, 29 Jun 2025 17:09:27 +0200 Subject: [PATCH 7/8] rollback foojay --- settings.gradle.kts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 9c8dee01a..913d47da7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -19,7 +19,8 @@ plugins { id("conventions-repositories") id("conventions-version-resolution") id("conventions-develocity") - id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" + // rollback to 0.9.0, as 1.0.0 requires JDK_17 on CI, which I have no time to set up + id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0" } dependencyResolutionManagement { From 37a255d950cd053c8831c1a9a0dd1dafc1b0a529 Mon Sep 17 00:00:00 2001 From: Alexander Sysoev Date: Sun, 29 Jun 2025 17:54:41 +0200 Subject: [PATCH 8/8] fix js compilation --- .../kotlinx/rpc/internal/internalServiceDescriptorOf.js.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/jsMain/kotlin/kotlinx/rpc/internal/internalServiceDescriptorOf.js.kt b/core/src/jsMain/kotlin/kotlinx/rpc/internal/internalServiceDescriptorOf.js.kt index a7c89136a..f1e5dac10 100644 --- a/core/src/jsMain/kotlin/kotlinx/rpc/internal/internalServiceDescriptorOf.js.kt +++ b/core/src/jsMain/kotlin/kotlinx/rpc/internal/internalServiceDescriptorOf.js.kt @@ -1,11 +1,13 @@ /* - * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. + * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. */ @file:Suppress("detekt.MatchingDeclarationName") package kotlinx.rpc.internal +import js.array.component1 +import js.array.component2 import js.objects.Object import kotlinx.rpc.annotations.Rpc import kotlinx.rpc.descriptor.RpcServiceDescriptor