From 509abad73eb23237c504ba634ac685390be3f0e9 Mon Sep 17 00:00:00 2001 From: Talo Halton Date: Tue, 30 Apr 2024 22:22:11 +0100 Subject: [PATCH] Use Kotlin 2.0.0-RC1 --- .gitignore | 3 ++- build.gradle.kts | 10 +++++++--- .../kotlin/spms/client/cli/CommandLineModeContext.kt | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4d71e61..437d232 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ build/ .gradle/ *.gen.kt src/nativeInterop -.vscode \ No newline at end of file +.vscode +/.kotlin \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 91a8170..908efba 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ val FLAG_LINK_STATIC: String = "linkStatic" val GENERATED_FILE_PREFIX: String = "// Generated on build in build.gradle.kts\n" plugins { - kotlin("multiplatform") version "1.9.23" + kotlin("multiplatform") version "2.0.0-RC1" kotlin("plugin.serialization") version "1.9.0" } @@ -82,7 +82,7 @@ enum class Platform { companion object { val supported: List = listOf( - LINUX_X86, LINUX_ARM64, WINDOWS + LINUX_X86//, LINUX_ARM64, WINDOWS ) fun getTarget(project: Project): Platform { @@ -203,7 +203,11 @@ fun KotlinMultiplatformExtension.configureKotlinTarget(platform: Platform) { if (!definition.platforms.contains(platform)) { continue } - create(definition.name) + + // TODO Use https://github.com/JetBrains/kotlin/blob/master/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/DefaultCInteropSettings.kt + create(definition.name) { + packageName(definition.name) + } } } } diff --git a/src/commonMain/kotlin/spms/client/cli/CommandLineModeContext.kt b/src/commonMain/kotlin/spms/client/cli/CommandLineModeContext.kt index a60f207..81abe07 100644 --- a/src/commonMain/kotlin/spms/client/cli/CommandLineModeContext.kt +++ b/src/commonMain/kotlin/spms/client/cli/CommandLineModeContext.kt @@ -1,4 +1,4 @@ -@file:Suppress("INVISIBLE_MEMBER") +@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") package spms.client.cli import cinterop.zmq.ZmqSocket