From 3a5276f4d315f8cc2e4589a892772d7260c8e811 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Sat, 11 Nov 2023 04:33:16 +0100 Subject: [PATCH] [stdlib] Fix compilation warnings in js-ir-minimal --- libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts | 3 ++- .../js-ir-minimal-for-test/src/smallRuntimeCollections.kt | 1 + libraries/stdlib/js-ir-minimal-for-test/src/tests.kt | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts b/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts index 51fa07ec9be..3b50a1b1727 100644 --- a/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts +++ b/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts @@ -131,7 +131,6 @@ val jsMainSources by task { into("builtins") } - from("$rootDir/libraries/stdlib/js-ir-minimal-for-test/src") into("$buildDir/jsMainSources") } @@ -143,6 +142,7 @@ kotlin { } named("jsMain") { kotlin.srcDir(files(jsMainSources.map { it.destinationDir })) + kotlin.srcDir("src") } } } @@ -150,6 +150,7 @@ kotlin { tasks.withType> { kotlinOptions.freeCompilerArgs += listOf( "-Xallow-kotlin-package", + "-Xexpect-actual-classes", "-opt-in=kotlin.ExperimentalMultiplatform", "-opt-in=kotlin.contracts.ExperimentalContracts", "-opt-in=kotlin.RequiresOptIn", diff --git a/libraries/stdlib/js-ir-minimal-for-test/src/smallRuntimeCollections.kt b/libraries/stdlib/js-ir-minimal-for-test/src/smallRuntimeCollections.kt index 0c8a43cac63..b4273f16c34 100644 --- a/libraries/stdlib/js-ir-minimal-for-test/src/smallRuntimeCollections.kt +++ b/libraries/stdlib/js-ir-minimal-for-test/src/smallRuntimeCollections.kt @@ -5,6 +5,7 @@ package kotlin.collections +@Suppress("UNUSED_PARAMETER") @SinceKotlin("1.4") @library("arrayEquals") public infix fun Array?.contentEquals(other: Array?): Boolean { diff --git a/libraries/stdlib/js-ir-minimal-for-test/src/tests.kt b/libraries/stdlib/js-ir-minimal-for-test/src/tests.kt index b4845b65ba9..044b6da8a2f 100644 --- a/libraries/stdlib/js-ir-minimal-for-test/src/tests.kt +++ b/libraries/stdlib/js-ir-minimal-for-test/src/tests.kt @@ -19,6 +19,7 @@ fun assertFalse(x: Boolean) { if (x) throw Exception("") } +@Suppress("UNUSED_PARAMETER") fun assertNotNull(actual: T?, message: String? = null): T { if (actual == null) throw Exception("") return actual