From 764545938aee76501aac09d7b3fa12b30d085bc3 Mon Sep 17 00:00:00 2001 From: "maarten.vercruysse" Date: Tue, 20 Oct 2026 12:38:03 +0200 Subject: [PATCH] Bump deps --- GeneratorScripts/build.gradle.kts | 17 ++++---- app/build.gradle.kts | 14 +++---- gradle/wrapper/gradle-wrapper.properties | 2 +- kotlin-js-store/yarn.lock | 52 +++++++++++++++++++----- settings.gradle.kts | 4 +- 5 files changed, 59 insertions(+), 30 deletions(-) diff --git a/GeneratorScripts/build.gradle.kts b/GeneratorScripts/build.gradle.kts index b9c200d4e..af4fdefd2 100644 --- a/GeneratorScripts/build.gradle.kts +++ b/GeneratorScripts/build.gradle.kts @@ -1,7 +1,7 @@ plugins { kotlin("jvm") - kotlin("plugin.serialization") version "2.3.21" - id("com.google.devtools.ksp").version("2.3.8") + kotlin("plugin.serialization") version "2.4.21" + id("com.google.devtools.ksp").version("2.3.12") } repositories { @@ -10,19 +10,19 @@ repositories { dependencies { testImplementation("org.jetbrains.kotlin:kotlin-test") - implementation("com.charleskorn.kaml:kaml:0.55.0") - val ktorVersion = "3.5.0" - val konvertVersion = "4.5.0" + implementation("com.charleskorn.kaml:kaml:0.104.0") + val ktorVersion = "3.6.0" + val konvertVersion = "4.5.1" implementation("io.ktor:ktor-client-core:$ktorVersion") implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion") implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion") implementation("io.ktor:ktor-client-logging:$ktorVersion") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.11.0") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.12.0") - implementation("com.squareup.okio:okio:3.17.0") - implementation("org.jetbrains.kotlinx:kotlinx-io-core:0.9.0") + implementation("com.squareup.okio:okio:3.18.2") + implementation("org.jetbrains.kotlinx:kotlinx-io-core:0.9.1") implementation("io.mcarle:konvert-api:$konvertVersion") implementation(project(":app")) @@ -36,4 +36,3 @@ tasks.test { kotlin { jvmToolchain(17) } - diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2085c9410..467e9f0cc 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -3,8 +3,8 @@ import org.jmailen.gradle.kotlinter.tasks.LintTask plugins { kotlin("multiplatform") - kotlin("plugin.serialization") version "2.3.21" - id("org.jmailen.kotlinter") version "5.6.0" + kotlin("plugin.serialization") version "2.4.21" + id("org.jmailen.kotlinter") version "5.7.0" id("com.vanniktech.maven.publish") version "0.37.0" id("com.android.kotlin.multiplatform.library") id("kotlin-parcelize") @@ -66,12 +66,12 @@ kotlin { } sourceSets { - val ktorVersion = "3.5.2" + val ktorVersion = "3.6.0" commonMain.dependencies { api("io.ktor:ktor-client-core:$ktorVersion") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.11.0") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.12.0") implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion") implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion") @@ -94,15 +94,15 @@ kotlin { implementation("io.mockk:mockk:1.14.11") implementation("org.wiremock:wiremock:3.13.2") implementation("com.marcinziolo:kotlin-wiremock:2.1.1") - implementation("ch.qos.logback:logback-classic:1.6.3") + implementation("ch.qos.logback:logback-classic:1.6.5") implementation("io.ktor:ktor-client-mock:$ktorVersion") } getByName("jvmE2eTest").dependencies { implementation(kotlin("test-junit5")) implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.11.0") - implementation("org.testcontainers:testcontainers:1.21.4") - implementation("ch.qos.logback:logback-classic:1.6.3") + implementation("org.testcontainers:testcontainers:2.0.5") + implementation("ch.qos.logback:logback-classic:1.6.5") } // Below required bc we use HttpClient() see https://ktor.io/docs/client-engines.html#default diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7ed99ba03..0320dbc26 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.2-bin.zip networkTimeout=10000 retries=1 retryBackOffMs=3000 diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock index 52b933cbf..8a592dac8 100644 --- a/kotlin-js-store/yarn.lock +++ b/kotlin-js-store/yarn.lock @@ -14,6 +14,11 @@ wrap-ansi "^8.1.0" wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" +"@js-joda/core@3.2.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@js-joda/core/-/core-3.2.0.tgz#3e61e21b7b2b8a6be746df1335cf91d70db2a273" + integrity sha512-PMqgJ0sw5B7FKb2d5bWYIoxjri+QlW/Pys7+Rw82jSH0QN3rB05jZ/VrrsUdh1w4+i2kw9JOejXGq/KhDOX7Kg== + "@pkgjs/parseargs@^0.11.0": version "0.11.0" resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" @@ -254,10 +259,10 @@ js-yaml@^4.1.0: dependencies: argparse "^2.0.1" -kotlin-web-helpers@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-3.0.0.tgz#3ed6b48f694f74bb60a737a9d7e2c0e3b29abdb9" - integrity sha512-kdQO4AJQkUPvpLh9aglkXDRyN+CfXO7pKq+GESEnxooBFkQpytLrqZis3ABvmFN1cGw/ZQ/K38u5sRGW+NfBnw== +kotlin-web-helpers@3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-3.3.0.tgz#4c0bf6bcfa64752f6f1531e4c84583943bc7e9d6" + integrity sha512-sXnwHZ2YGMtIia+NQlf/c0UDtwVNHhXsIH+uHkTv87AvvZQJjJ+XbdkvUUuomPWgBC5TgcQLDEGLcjL48QkFkQ== dependencies: format-util "^1.0.5" @@ -293,10 +298,10 @@ minimatch@^9.0.4, minimatch@^9.0.5: resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.3.tgz#79389b4eb1bb2d003a9bba87d492f2bd37bdc65b" integrity sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A== -mocha@11.7.5: - version "11.7.5" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-11.7.5.tgz#58f5bbfa5e0211ce7e5ee6128107cefc2515a627" - integrity sha512-mTT6RgopEYABzXWFx+GcJ+ZQ32kp4fMf0xvpZIIfSq9Z8lC/++MtcCnQ9t5FP2veYEP95FIYSvW+U9fV4xrlig== +mocha@11.7.6: + version "11.7.6" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-11.7.6.tgz#ebbe22989d04cbb9424a36307320476624c41a33" + integrity sha512-nS9xOGbw2I3cjCpxwZAEJ9xK9lmJ08vEkQvLtz4du9ZrF9UrjRpeJGiIgl2Z+Qs++pmB4ecDe48Fwsh+j+j7xA== dependencies: browser-stdout "^1.3.1" chokidar "^4.0.1" @@ -426,7 +431,16 @@ source-map@^0.6.0: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -444,7 +458,14 @@ string-width@^5.0.1, string-width@^5.1.2: emoji-regex "^9.2.2" strip-ansi "^7.0.1" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -489,7 +510,16 @@ workerpool@^9.2.0: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-9.3.4.tgz#f6c92395b2141afd78e2a889e80cb338fe9fca41" integrity sha512-TmPRQYYSAnnDiEB0P/Ytip7bFGvqnSU6I2BcuSw7Hx+JSg/DsUi5ebYfc8GYaSdpuvOcEs6dXxPurOYpe9QFwg== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== diff --git a/settings.gradle.kts b/settings.gradle.kts index ae292546c..0ec532aa7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,8 +15,8 @@ dependencyResolutionManagement { plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" - kotlin("jvm") version "2.3.21" apply false - id("com.android.kotlin.multiplatform.library") version "9.2.1" apply false + kotlin("jvm") version "2.4.21" apply false + id("com.android.kotlin.multiplatform.library") version "9.4.1" apply false } rootProject.name = "LemmyBackwardsCompatibleAPI"