From ddcaa1864ffc26e8482770ad2c16ba424af8a0ac Mon Sep 17 00:00:00 2001 From: Ignat Beresnev Date: Fri, 4 Aug 2023 13:37:12 +0200 Subject: Update examples and tests to use Kotlin 1.9.0 (#3101) * Opt into foreign API for CPointed * Stop using the deprecated JS backend --- examples/gradle/dokka-customFormat-example/build.gradle.kts | 2 +- examples/gradle/dokka-gradle-example/build.gradle.kts | 2 +- examples/gradle/dokka-kotlinAsJava-example/build.gradle.kts | 2 +- examples/gradle/dokka-library-publishing-example/build.gradle.kts | 2 +- examples/gradle/dokka-multimodule-example/gradle.properties | 2 +- examples/gradle/dokka-multiplatform-example/build.gradle.kts | 4 ++-- .../src/linuxMain/kotlin/org/kotlintestmpp/CInterop.kt | 2 ++ examples/gradle/dokka-versioning-multimodule-example/build.gradle.kts | 2 +- examples/maven/pom.xml | 2 +- examples/plugin/hide-internal-api/build.gradle.kts | 2 +- 10 files changed, 12 insertions(+), 10 deletions(-) (limited to 'examples') diff --git a/examples/gradle/dokka-customFormat-example/build.gradle.kts b/examples/gradle/dokka-customFormat-example/build.gradle.kts index 1d6e2812..15ac64aa 100644 --- a/examples/gradle/dokka-customFormat-example/build.gradle.kts +++ b/examples/gradle/dokka-customFormat-example/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.dokka.base.DokkaBase import org.jetbrains.dokka.base.DokkaBaseConfiguration plugins { - kotlin("jvm") version "1.8.20" + kotlin("jvm") version "1.9.0" id("org.jetbrains.dokka") version "1.8.20" } diff --git a/examples/gradle/dokka-gradle-example/build.gradle.kts b/examples/gradle/dokka-gradle-example/build.gradle.kts index ef1e4847..2098c1fd 100644 --- a/examples/gradle/dokka-gradle-example/build.gradle.kts +++ b/examples/gradle/dokka-gradle-example/build.gradle.kts @@ -2,7 +2,7 @@ import org.jetbrains.dokka.gradle.DokkaTask import java.net.URL plugins { - kotlin("jvm") version "1.8.20" + kotlin("jvm") version "1.9.0" id("org.jetbrains.dokka") version "1.8.20" } diff --git a/examples/gradle/dokka-kotlinAsJava-example/build.gradle.kts b/examples/gradle/dokka-kotlinAsJava-example/build.gradle.kts index f5069636..a0f5d2f8 100644 --- a/examples/gradle/dokka-kotlinAsJava-example/build.gradle.kts +++ b/examples/gradle/dokka-kotlinAsJava-example/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.8.20" + kotlin("jvm") version "1.9.0" id("org.jetbrains.dokka") version "1.8.20" } diff --git a/examples/gradle/dokka-library-publishing-example/build.gradle.kts b/examples/gradle/dokka-library-publishing-example/build.gradle.kts index d533a976..d2ce0d00 100644 --- a/examples/gradle/dokka-library-publishing-example/build.gradle.kts +++ b/examples/gradle/dokka-library-publishing-example/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.8.20" + kotlin("jvm") version "1.9.0" id("org.jetbrains.dokka") version "1.8.20" `java-library` `maven-publish` diff --git a/examples/gradle/dokka-multimodule-example/gradle.properties b/examples/gradle/dokka-multimodule-example/gradle.properties index 48c3e308..fc6d5627 100644 --- a/examples/gradle/dokka-multimodule-example/gradle.properties +++ b/examples/gradle/dokka-multimodule-example/gradle.properties @@ -1,2 +1,2 @@ -kotlinVersion=1.8.20 +kotlinVersion=1.9.0 dokkaVersion=1.8.20 diff --git a/examples/gradle/dokka-multiplatform-example/build.gradle.kts b/examples/gradle/dokka-multiplatform-example/build.gradle.kts index 9d4283c9..6477375a 100644 --- a/examples/gradle/dokka-multiplatform-example/build.gradle.kts +++ b/examples/gradle/dokka-multiplatform-example/build.gradle.kts @@ -4,7 +4,7 @@ import org.jetbrains.dokka.gradle.DokkaTask import org.jetbrains.dokka.Platform plugins { - kotlin("multiplatform") version "1.8.20" + kotlin("multiplatform") version "1.9.0" id("org.jetbrains.dokka") version "1.8.20" } @@ -19,7 +19,7 @@ kotlin { jvm() // Creates a JVM target with the default name "jvm" linuxX64("linux") macosX64("macos") - js(BOTH) + js() sourceSets { val commonMain by getting { dependencies { diff --git a/examples/gradle/dokka-multiplatform-example/src/linuxMain/kotlin/org/kotlintestmpp/CInterop.kt b/examples/gradle/dokka-multiplatform-example/src/linuxMain/kotlin/org/kotlintestmpp/CInterop.kt index c42cfea1..5c84780b 100644 --- a/examples/gradle/dokka-multiplatform-example/src/linuxMain/kotlin/org/kotlintestmpp/CInterop.kt +++ b/examples/gradle/dokka-multiplatform-example/src/linuxMain/kotlin/org/kotlintestmpp/CInterop.kt @@ -4,10 +4,12 @@ package org.kotlintestmpp import kotlinx.cinterop.CPointed import kotlinx.cinterop.CPointer +import kotlinx.cinterop.ExperimentalForeignApi /** * Low-level Linux function */ +@OptIn(ExperimentalForeignApi::class) fun printPointerRawValue(pointer: CPointer) { println(pointer.rawValue) } diff --git a/examples/gradle/dokka-versioning-multimodule-example/build.gradle.kts b/examples/gradle/dokka-versioning-multimodule-example/build.gradle.kts index b6f2af36..cb49d8b0 100644 --- a/examples/gradle/dokka-versioning-multimodule-example/build.gradle.kts +++ b/examples/gradle/dokka-versioning-multimodule-example/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.8.20" + kotlin("jvm") version "1.9.0" id("org.jetbrains.dokka") version "1.8.20" apply false } diff --git a/examples/maven/pom.xml b/examples/maven/pom.xml index 48eea238..185c36cf 100644 --- a/examples/maven/pom.xml +++ b/examples/maven/pom.xml @@ -8,7 +8,7 @@ kotlin-maven-example 1.0-SNAPSHOT - 1.8.20 + 1.9.0 1.8.20 diff --git a/examples/plugin/hide-internal-api/build.gradle.kts b/examples/plugin/hide-internal-api/build.gradle.kts index f9775de1..089f319e 100644 --- a/examples/plugin/hide-internal-api/build.gradle.kts +++ b/examples/plugin/hide-internal-api/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import java.net.URI plugins { - kotlin("jvm") version "1.8.20" + kotlin("jvm") version "1.9.0" id("org.jetbrains.dokka") version "1.8.20" `maven-publish` signing -- cgit