Skip to content

Commit acaac14

Browse files
committed
Update examples and tests to use Kotlin 1.9.0 (#3101)
* Opt into foreign API for CPointed * Stop using the deprecated JS backend (cherry picked from commit ddcaa18)
1 parent ba50856 commit acaac14

File tree

22 files changed

+24
-22
lines changed

22 files changed

+24
-22
lines changed

examples/gradle/dokka-customFormat-example/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.jetbrains.dokka.base.DokkaBase
33
import org.jetbrains.dokka.base.DokkaBaseConfiguration
44

55
plugins {
6-
kotlin("jvm") version "1.8.20"
6+
kotlin("jvm") version "1.9.0"
77
id("org.jetbrains.dokka") version "1.8.20"
88
}
99

examples/gradle/dokka-gradle-example/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import org.jetbrains.dokka.gradle.DokkaTask
22
import java.net.URL
33

44
plugins {
5-
kotlin("jvm") version "1.8.20"
5+
kotlin("jvm") version "1.9.0"
66
id("org.jetbrains.dokka") version "1.8.20"
77
}
88

examples/gradle/dokka-kotlinAsJava-example/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
kotlin("jvm") version "1.8.20"
2+
kotlin("jvm") version "1.9.0"
33
id("org.jetbrains.dokka") version "1.8.20"
44
}
55

examples/gradle/dokka-library-publishing-example/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
kotlin("jvm") version "1.8.20"
2+
kotlin("jvm") version "1.9.0"
33
id("org.jetbrains.dokka") version "1.8.20"
44
`java-library`
55
`maven-publish`
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
kotlinVersion=1.8.20
1+
kotlinVersion=1.9.0
22
dokkaVersion=1.8.20

examples/gradle/dokka-multiplatform-example/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import org.jetbrains.dokka.gradle.DokkaTask
44
import org.jetbrains.dokka.Platform
55

66
plugins {
7-
kotlin("multiplatform") version "1.8.20"
7+
kotlin("multiplatform") version "1.9.0"
88
id("org.jetbrains.dokka") version "1.8.20"
99
}
1010

@@ -19,7 +19,7 @@ kotlin {
1919
jvm() // Creates a JVM target with the default name "jvm"
2020
linuxX64("linux")
2121
macosX64("macos")
22-
js(BOTH)
22+
js()
2323
sourceSets {
2424
val commonMain by getting {
2525
dependencies {

examples/gradle/dokka-multiplatform-example/src/linuxMain/kotlin/org/kotlintestmpp/CInterop.kt

+2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ package org.kotlintestmpp
44

55
import kotlinx.cinterop.CPointed
66
import kotlinx.cinterop.CPointer
7+
import kotlinx.cinterop.ExperimentalForeignApi
78

89
/**
910
* Low-level Linux function
1011
*/
12+
@OptIn(ExperimentalForeignApi::class)
1113
fun <T : CPointed> printPointerRawValue(pointer: CPointer<T>) {
1214
println(pointer.rawValue)
1315
}

examples/gradle/dokka-versioning-multimodule-example/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
kotlin("jvm") version "1.8.20"
2+
kotlin("jvm") version "1.9.0"
33
id("org.jetbrains.dokka") version "1.8.20" apply false
44
}
55

examples/maven/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<artifactId>kotlin-maven-example</artifactId>
99
<version>1.0-SNAPSHOT</version>
1010
<properties>
11-
<kotlin.version>1.8.20</kotlin.version>
11+
<kotlin.version>1.9.0</kotlin.version>
1212
<dokka.version>1.8.20</dokka.version>
1313
</properties>
1414

examples/plugin/hide-internal-api/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33
import java.net.URI
44

55
plugins {
6-
kotlin("jvm") version "1.8.20"
6+
kotlin("jvm") version "1.9.0"
77
id("org.jetbrains.dokka") version "1.8.20"
88
`maven-publish`
99
signing
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dokka_it_kotlin_version=1.8.20
1+
dokka_it_kotlin_version=1.9.0
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dokka_it_kotlin_version=1.8.20
1+
dokka_it_kotlin_version=1.9.0
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dokka_it_kotlin_version=1.8.20
1+
dokka_it_kotlin_version=1.9.0
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
dokka_it_kotlin_version=1.8.20
1+
dokka_it_kotlin_version=1.9.0
22
fail_on_warning=false
33
report_undocumented=false
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
dokka_it_kotlin_version=1.8.20
1+
dokka_it_kotlin_version=1.9.0
22
react_version=18.2.0-pre.467
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dokka_it_kotlin_version=1.8.20
1+
dokka_it_kotlin_version=1.9.0
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dokka_it_kotlin_version=1.8.20
1+
dokka_it_kotlin_version=1.9.0
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
dokka_it_kotlin_version=1.8.20
1+
dokka_it_kotlin_version=1.9.0
22

integration-tests/gradle/projects/it-multiplatform-0/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
dokka_it_kotlin_version=1.8.20
1+
dokka_it_kotlin_version=1.9.0
22
#these flags are enabled by default since 1.6.20.
33
#remove when this test is executed with Kotlin >= 1.6.20
44
kotlin.mpp.enableGranularSourceSetsMetadata=true
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
dokka_it_kotlin_version=1.8.20
1+
dokka_it_kotlin_version=1.9.0
22
task_number=100
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dokka_it_kotlin_version=1.8.20
1+
dokka_it_kotlin_version=1.9.0

integration-tests/maven/projects/it-maven/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<version>1.0-SNAPSHOT</version>
88

99
<properties>
10-
<kotlin.version>1.8.20</kotlin.version>
10+
<kotlin.version>1.9.0</kotlin.version>
1111
</properties>
1212
<build>
1313
<plugins>

0 commit comments

Comments
 (0)