diff options
author | Ignat Beresnev <ignat.beresnev@jetbrains.com> | 2023-08-04 13:37:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-04 13:37:12 +0200 |
commit | ddcaa1864ffc26e8482770ad2c16ba424af8a0ac (patch) | |
tree | 2ddd3eb163611d2448f8608857a3d97597b71231 | |
parent | ec95267a8bcb92733e506a41e7cc6305b1ff0552 (diff) | |
download | dokka-ddcaa1864ffc26e8482770ad2c16ba424af8a0ac.tar.gz dokka-ddcaa1864ffc26e8482770ad2c16ba424af8a0ac.tar.bz2 dokka-ddcaa1864ffc26e8482770ad2c16ba424af8a0ac.zip |
Update examples and tests to use Kotlin 1.9.0 (#3101)
* Opt into foreign API for CPointed
* Stop using the deprecated JS backend
22 files changed, 24 insertions, 22 deletions
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 <T : CPointed> printPointerRawValue(pointer: CPointer<T>) { 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 @@ <artifactId>kotlin-maven-example</artifactId> <version>1.0-SNAPSHOT</version> <properties> - <kotlin.version>1.8.20</kotlin.version> + <kotlin.version>1.9.0</kotlin.version> <dokka.version>1.8.20</dokka.version> </properties> 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 diff --git a/integration-tests/gradle/projects/it-basic-groovy/gradle.properties b/integration-tests/gradle/projects/it-basic-groovy/gradle.properties index fb15e935..1181ddfb 100644 --- a/integration-tests/gradle/projects/it-basic-groovy/gradle.properties +++ b/integration-tests/gradle/projects/it-basic-groovy/gradle.properties @@ -1 +1 @@ -dokka_it_kotlin_version=1.8.20 +dokka_it_kotlin_version=1.9.0 diff --git a/integration-tests/gradle/projects/it-basic/gradle.properties b/integration-tests/gradle/projects/it-basic/gradle.properties index fb15e935..1181ddfb 100644 --- a/integration-tests/gradle/projects/it-basic/gradle.properties +++ b/integration-tests/gradle/projects/it-basic/gradle.properties @@ -1 +1 @@ -dokka_it_kotlin_version=1.8.20 +dokka_it_kotlin_version=1.9.0 diff --git a/integration-tests/gradle/projects/it-collector-0/gradle.properties b/integration-tests/gradle/projects/it-collector-0/gradle.properties index fb15e935..1181ddfb 100644 --- a/integration-tests/gradle/projects/it-collector-0/gradle.properties +++ b/integration-tests/gradle/projects/it-collector-0/gradle.properties @@ -1 +1 @@ -dokka_it_kotlin_version=1.8.20 +dokka_it_kotlin_version=1.9.0 diff --git a/integration-tests/gradle/projects/it-configuration/gradle.properties b/integration-tests/gradle/projects/it-configuration/gradle.properties index 4606afb9..cc54233c 100644 --- a/integration-tests/gradle/projects/it-configuration/gradle.properties +++ b/integration-tests/gradle/projects/it-configuration/gradle.properties @@ -1,3 +1,3 @@ -dokka_it_kotlin_version=1.8.20 +dokka_it_kotlin_version=1.9.0 fail_on_warning=false report_undocumented=false diff --git a/integration-tests/gradle/projects/it-js-ir-0/gradle.properties b/integration-tests/gradle/projects/it-js-ir-0/gradle.properties index dadd2bc8..5a732839 100644 --- a/integration-tests/gradle/projects/it-js-ir-0/gradle.properties +++ b/integration-tests/gradle/projects/it-js-ir-0/gradle.properties @@ -1,2 +1,2 @@ -dokka_it_kotlin_version=1.8.20 +dokka_it_kotlin_version=1.9.0 react_version=18.2.0-pre.467 diff --git a/integration-tests/gradle/projects/it-multimodule-0/gradle.properties b/integration-tests/gradle/projects/it-multimodule-0/gradle.properties index fb15e935..1181ddfb 100644 --- a/integration-tests/gradle/projects/it-multimodule-0/gradle.properties +++ b/integration-tests/gradle/projects/it-multimodule-0/gradle.properties @@ -1 +1 @@ -dokka_it_kotlin_version=1.8.20 +dokka_it_kotlin_version=1.9.0 diff --git a/integration-tests/gradle/projects/it-multimodule-1/gradle.properties b/integration-tests/gradle/projects/it-multimodule-1/gradle.properties index fb15e935..1181ddfb 100644 --- a/integration-tests/gradle/projects/it-multimodule-1/gradle.properties +++ b/integration-tests/gradle/projects/it-multimodule-1/gradle.properties @@ -1 +1 @@ -dokka_it_kotlin_version=1.8.20 +dokka_it_kotlin_version=1.9.0 diff --git a/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties b/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties index da540377..bd42059c 100644 --- a/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties +++ b/integration-tests/gradle/projects/it-multimodule-versioning-0/gradle.properties @@ -1,2 +1,2 @@ -dokka_it_kotlin_version=1.8.20 +dokka_it_kotlin_version=1.9.0 diff --git a/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties b/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties index aac2680b..686edd2a 100644 --- a/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties +++ b/integration-tests/gradle/projects/it-multiplatform-0/gradle.properties @@ -1,4 +1,4 @@ -dokka_it_kotlin_version=1.8.20 +dokka_it_kotlin_version=1.9.0 #these flags are enabled by default since 1.6.20. #remove when this test is executed with Kotlin >= 1.6.20 kotlin.mpp.enableGranularSourceSetsMetadata=true diff --git a/integration-tests/gradle/projects/it-sequential-tasks-execution-stress/gradle.properties b/integration-tests/gradle/projects/it-sequential-tasks-execution-stress/gradle.properties index 69f10f75..13459b8c 100644 --- a/integration-tests/gradle/projects/it-sequential-tasks-execution-stress/gradle.properties +++ b/integration-tests/gradle/projects/it-sequential-tasks-execution-stress/gradle.properties @@ -1,2 +1,2 @@ -dokka_it_kotlin_version=1.8.20 +dokka_it_kotlin_version=1.9.0 task_number=100 diff --git a/integration-tests/gradle/projects/it-wasm-basic/gradle.properties b/integration-tests/gradle/projects/it-wasm-basic/gradle.properties index fb15e935..1181ddfb 100644 --- a/integration-tests/gradle/projects/it-wasm-basic/gradle.properties +++ b/integration-tests/gradle/projects/it-wasm-basic/gradle.properties @@ -1 +1 @@ -dokka_it_kotlin_version=1.8.20 +dokka_it_kotlin_version=1.9.0 diff --git a/integration-tests/maven/projects/it-maven/pom.xml b/integration-tests/maven/projects/it-maven/pom.xml index 9d5ce50a..8a5624b7 100644 --- a/integration-tests/maven/projects/it-maven/pom.xml +++ b/integration-tests/maven/projects/it-maven/pom.xml @@ -7,7 +7,7 @@ <version>1.0-SNAPSHOT</version> <properties> - <kotlin.version>1.8.20</kotlin.version> + <kotlin.version>1.9.0</kotlin.version> </properties> <build> <plugins> |