Skip to content

Commit a0d0c5e

Browse files
swankjessesquarejesseJakeWharton
authored
Upgrade to Kotlin 2.2.0 (#1670)
* Upgrade to Kotlin 2.2.0 Also Burst 2.6.0 Closes: #1632 * Update Yarn lock --------- Co-authored-by: Jesse Wilson <[email protected]> Co-authored-by: Jake Wharton <[email protected]>
1 parent 9e25e03 commit a0d0c5e

File tree

3 files changed

+8
-22
lines changed

3 files changed

+8
-22
lines changed

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
jmh = "1.37"
3-
kotlin = "2.1.21"
3+
kotlin = "2.2.0"
44
ktlint = "0.48.2"
55

66
[libraries]
@@ -10,7 +10,7 @@ androidx-test-ext-junit = { module = "androidx.test.ext:junit", version = "1.2.1
1010
androidx-test-runner = { module = "androidx.test:runner", version = "1.5.2" }
1111
binaryCompatibilityValidator = { module = "org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin", version = "0.18.1" }
1212
bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version = "7.1.0" }
13-
burst-gradle-plugin = { module = "app.cash.burst:burst-gradle-plugin", version = "2.5.0" }
13+
burst-gradle-plugin = { module = "app.cash.burst:burst-gradle-plugin", version = "2.6.0" }
1414
dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "2.0.0" }
1515
jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
1616
jmh-generator = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }

kotlin-js-store/yarn.lock

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,11 +1747,6 @@ type-is@~1.6.18:
17471747
media-typer "0.3.0"
17481748
mime-types "~2.1.24"
17491749

1750-
1751-
version "5.5.4"
1752-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
1753-
integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==
1754-
17551750
ua-parser-js@^0.7.30:
17561751
version "0.7.35"
17571752
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.35.tgz#8bda4827be4f0b1dda91699a29499575a1f1d307"

okio-wasifilesystem/build.gradle.kts

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ configure<MavenPublishBaseExtension> {
5757
*/
5858
val injectWasiInit by tasks.creating {
5959
dependsOn("compileTestDevelopmentExecutableKotlinWasmWasi")
60-
val moduleName = "${rootProject.name}-${project.name}-wasm-wasi-test"
60+
val moduleName = "${rootProject.name}-${project.name}-test"
6161

6262
val entryPointMjs = File(
6363
buildDir,
@@ -92,28 +92,19 @@ val injectWasiInit by tasks.creating {
9292
9393
const fs = await import('node:fs');
9494
const url = await import('node:url');
95-
const wasmBuffer = fs.readFileSync(url.fileURLToPath(import.meta.resolve('./okio-parent-okio-wasifilesystem-wasm-wasi-test.wasm')));
95+
const wasmBuffer = fs.readFileSync(url.fileURLToPath(import.meta.resolve('./$moduleName.wasm')));
9696
const wasmModule = new WebAssembly.Module(wasmBuffer);
9797
const wasmInstance = new WebAssembly.Instance(wasmModule, wasi.getImportObject());
9898
9999
wasi.initialize(wasmInstance);
100100
101101
const exports = wasmInstance.exports
102102
103-
export default new Proxy(exports, {
104-
_shownError: false,
105-
get(target, prop) {
106-
if (!this._shownError) {
107-
this._shownError = true;
108-
throw new Error("Do not use default import. Use the corresponding named import instead.")
109-
}
110-
}
111-
});
112103
export const {
113-
startUnitTests,
114-
_initialize,
115-
memory
116-
} = exports;
104+
memory,
105+
_initialize,
106+
startUnitTests
107+
} = exports
117108
""".trimIndent()
118109
)
119110
}

0 commit comments

Comments
 (0)