From b6b4d52e5f0099328a5bc288249058e573dc19ff Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 23:54:07 -0500 Subject: [PATCH] Update dependency org.jetbrains.kotlin:kotlin-gradle-plugin to v2.1.0 (#1552) * Update dependency org.jetbrains.kotlin:kotlin-gradle-plugin to v2.1.0 * Update platforms.kt * Update build.gradle.kts * Update build.gradle.kts * Remove old memory model annotations * Burst 2.2.0 * Update Yarn lock --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jake Wharton --- build-support/src/main/kotlin/platforms.kt | 1 - gradle/libs.versions.toml | 4 +- kotlin-js-store/yarn.lock | 59 +++++++------------ okio-fakefilesystem/build.gradle.kts | 1 - okio-nodefilesystem/build.gradle.kts | 1 - okio/src/commonMain/kotlin/okio/Base64.kt | 3 - okio/src/commonMain/kotlin/okio/Util.kt | 2 - .../commonMain/kotlin/okio/internal/Buffer.kt | 2 - .../kotlin/okio/internal/ByteString.kt | 2 - .../commonMain/kotlin/okio/internal/Path.kt | 6 -- 10 files changed, 24 insertions(+), 57 deletions(-) diff --git a/build-support/src/main/kotlin/platforms.kt b/build-support/src/main/kotlin/platforms.kt index 4cfb5ae59b..002c49e57b 100644 --- a/build-support/src/main/kotlin/platforms.kt +++ b/build-support/src/main/kotlin/platforms.kt @@ -125,7 +125,6 @@ fun KotlinMultiplatformExtension.configureOrCreateJsPlatforms() { kotlinOptions { moduleKind = "umd" sourceMap = true - metaInfo = true } } nodejs { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4ec9bed4b1..6ff1327543 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] jmh = "1.37" -kotlin = "2.0.21" +kotlin = "2.1.0" ktlint = "0.48.2" [libraries] @@ -10,7 +10,7 @@ androidx-test-ext-junit = { module = "androidx.test.ext:junit", version = "1.2.1 androidx-test-runner = { module = "androidx.test:runner", version = "1.5.2" } binaryCompatibilityValidator = { module = "org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin", version = "0.16.3" } bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version = "7.1.0" } -burst-gradle-plugin = { module = "app.cash.burst:burst-gradle-plugin", version = "2.1.0" } +burst-gradle-plugin = { module = "app.cash.burst:burst-gradle-plugin", version = "2.2.0" } dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "1.9.20" } jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" } jmh-generator = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" } diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock index 3aabb8020c..207deee960 100644 --- a/kotlin-js-store/yarn.lock +++ b/kotlin-js-store/yarn.lock @@ -97,33 +97,12 @@ dependencies: "@types/node" "*" -"@types/eslint-scope@^3.7.3": - version "3.7.4" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16" - integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA== - dependencies: - "@types/eslint" "*" - "@types/estree" "*" - -"@types/eslint@*": - version "8.44.0" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.0.tgz#55818eabb376e2272f77fbf5c96c43137c3c1e53" - integrity sha512-gsF+c/0XOguWgaOgvFs+xnnRqt9GwgTvIks36WpE6ueeI4KCEHHd8K/CKHqhOqrJKsYH8m27kRzQEvWXAwXUTw== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - -"@types/estree@*": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194" - integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA== - "@types/estree@^1.0.5": version "1.0.6" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50" integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw== -"@types/json-schema@*", "@types/json-schema@^7.0.8": +"@types/json-schema@^7.0.8": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb" integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA== @@ -677,7 +656,7 @@ engine.io@~6.6.0: engine.io-parser "~5.2.1" ws "~8.17.1" -enhanced-resolve@^5.17.0: +enhanced-resolve@^5.17.1: version "5.17.1" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15" integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg== @@ -1128,10 +1107,10 @@ karma-webpack@5.0.1: minimatch "^9.0.3" webpack-merge "^4.1.5" -karma@6.4.3: - version "6.4.3" - resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.3.tgz#763e500f99597218bbb536de1a14acc4ceea7ce8" - integrity sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q== +karma@6.4.4: + version "6.4.4" + resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492" + integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w== dependencies: "@colors/colors" "1.5.0" body-parser "^1.19.0" @@ -1163,6 +1142,13 @@ kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== +kotlin-web-helpers@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286" + integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw== + dependencies: + format-util "^1.0.5" + loader-runner@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" @@ -1266,10 +1252,10 @@ mkdirp@^0.5.5: dependencies: minimist "^1.2.6" -mocha@10.7.0: - version "10.7.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.0.tgz#9e5cbed8fa9b37537a25bd1f7fb4f6fc45458b9a" - integrity sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA== +mocha@10.7.3: + version "10.7.3" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.3.tgz#ae32003cabbd52b59aece17846056a68eb4b0752" + integrity sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A== dependencies: ansi-colors "^4.1.3" browser-stdout "^1.3.1" @@ -1858,12 +1844,11 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@5.93.0: - version "5.93.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5" - integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA== +webpack@5.94.0: + version "5.94.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f" + integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg== dependencies: - "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.5" "@webassemblyjs/ast" "^1.12.1" "@webassemblyjs/wasm-edit" "^1.12.1" @@ -1872,7 +1857,7 @@ webpack@5.93.0: acorn-import-attributes "^1.9.5" browserslist "^4.21.10" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.17.0" + enhanced-resolve "^5.17.1" es-module-lexer "^1.2.1" eslint-scope "5.1.1" events "^3.2.0" diff --git a/okio-fakefilesystem/build.gradle.kts b/okio-fakefilesystem/build.gradle.kts index e1816f8664..c5eadf06d6 100644 --- a/okio-fakefilesystem/build.gradle.kts +++ b/okio-fakefilesystem/build.gradle.kts @@ -19,7 +19,6 @@ kotlin { kotlinOptions { moduleKind = "umd" sourceMap = true - metaInfo = true } } nodejs { diff --git a/okio-nodefilesystem/build.gradle.kts b/okio-nodefilesystem/build.gradle.kts index fde6c511af..b69ff32830 100644 --- a/okio-nodefilesystem/build.gradle.kts +++ b/okio-nodefilesystem/build.gradle.kts @@ -16,7 +16,6 @@ kotlin { kotlinOptions { moduleKind = "umd" sourceMap = true - metaInfo = true } } } diff --git a/okio/src/commonMain/kotlin/okio/Base64.kt b/okio/src/commonMain/kotlin/okio/Base64.kt index 150793cc40..b513656fca 100644 --- a/okio/src/commonMain/kotlin/okio/Base64.kt +++ b/okio/src/commonMain/kotlin/okio/Base64.kt @@ -19,16 +19,13 @@ package okio import kotlin.jvm.JvmName -import kotlin.native.concurrent.SharedImmutable import okio.ByteString.Companion.encodeUtf8 /** @author Alexander Y. Kleymenov */ -@SharedImmutable internal val BASE64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".encodeUtf8().data -@SharedImmutable internal val BASE64_URL_SAFE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_".encodeUtf8().data diff --git a/okio/src/commonMain/kotlin/okio/Util.kt b/okio/src/commonMain/kotlin/okio/Util.kt index bfd8fec1b2..9e6e9c50af 100644 --- a/okio/src/commonMain/kotlin/okio/Util.kt +++ b/okio/src/commonMain/kotlin/okio/Util.kt @@ -18,7 +18,6 @@ package okio import kotlin.jvm.JvmName -import kotlin.native.concurrent.SharedImmutable import okio.internal.HEX_DIGIT_CHARS internal fun checkOffsetAndCount(size: Long, offset: Long, byteCount: Long) { @@ -167,7 +166,6 @@ internal fun Long.toHexString(): String { // for them in the receiving function, then swap in the true default value. // https://youtrack.jetbrains.com/issue/KT-45542 -@SharedImmutable internal val DEFAULT__new_UnsafeCursor = Buffer.UnsafeCursor() internal fun resolveDefaultParameter(unsafeCursor: Buffer.UnsafeCursor): Buffer.UnsafeCursor { if (unsafeCursor === DEFAULT__new_UnsafeCursor) return Buffer.UnsafeCursor() diff --git a/okio/src/commonMain/kotlin/okio/internal/Buffer.kt b/okio/src/commonMain/kotlin/okio/internal/Buffer.kt index 13194403ee..36315c176f 100644 --- a/okio/src/commonMain/kotlin/okio/internal/Buffer.kt +++ b/okio/src/commonMain/kotlin/okio/internal/Buffer.kt @@ -21,7 +21,6 @@ package okio.internal import kotlin.jvm.JvmName -import kotlin.native.concurrent.SharedImmutable import okio.ArrayIndexOutOfBoundsException import okio.Buffer import okio.Buffer.UnsafeCursor @@ -41,7 +40,6 @@ import okio.minOf import okio.resolveDefaultParameter import okio.toHexString -@SharedImmutable internal val HEX_DIGIT_BYTES = "0123456789abcdef".asUtf8ToByteArray() // Threshold determined empirically via ReadByteStringBenchmark diff --git a/okio/src/commonMain/kotlin/okio/internal/ByteString.kt b/okio/src/commonMain/kotlin/okio/internal/ByteString.kt index 311c17e57b..d8899acd10 100644 --- a/okio/src/commonMain/kotlin/okio/internal/ByteString.kt +++ b/okio/src/commonMain/kotlin/okio/internal/ByteString.kt @@ -18,7 +18,6 @@ package okio.internal import kotlin.jvm.JvmName -import kotlin.native.concurrent.SharedImmutable import okio.BASE64_URL_SAFE import okio.Buffer import okio.ByteString @@ -55,7 +54,6 @@ internal inline fun ByteString.commonBase64(): String = data.encodeBase64() @Suppress("NOTHING_TO_INLINE") internal inline fun ByteString.commonBase64Url() = data.encodeBase64(map = BASE64_URL_SAFE) -@SharedImmutable internal val HEX_DIGIT_CHARS = charArrayOf('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f') diff --git a/okio/src/commonMain/kotlin/okio/internal/Path.kt b/okio/src/commonMain/kotlin/okio/internal/Path.kt index 16e5648229..c5aeb7a70d 100644 --- a/okio/src/commonMain/kotlin/okio/internal/Path.kt +++ b/okio/src/commonMain/kotlin/okio/internal/Path.kt @@ -18,26 +18,20 @@ package okio.internal import kotlin.jvm.JvmName -import kotlin.native.concurrent.SharedImmutable import okio.Buffer import okio.ByteString import okio.ByteString.Companion.encodeUtf8 import okio.Path import okio.Path.Companion.toPath -@SharedImmutable private val SLASH = "/".encodeUtf8() -@SharedImmutable private val BACKSLASH = "\\".encodeUtf8() -@SharedImmutable private val ANY_SLASH = "/\\".encodeUtf8() -@SharedImmutable private val DOT = ".".encodeUtf8() -@SharedImmutable private val DOT_DOT = "..".encodeUtf8() @Suppress("NOTHING_TO_INLINE")