Skip to content

Commit 94eec02

Browse files
authored
Run integration tests with Kotlin 2.1.0 (#3865)
* Fix an error in the integration test with declaration redeclaration
1 parent 2b63314 commit 94eec02

File tree

8 files changed

+25
-11
lines changed

8 files changed

+25
-11
lines changed

dokka-integration-tests/gradle/projects/it-multiplatform-0/src/commonMain/kotlin/it/mpp0/ExpectedClass.kt

+4
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@ package it.mpp0
33
expect class ExpectedClass {
44
val platform: String
55
}
6+
7+
expect class ExpectedClass2 {
8+
val platform: String
9+
}

dokka-integration-tests/gradle/projects/it-multiplatform-0/src/desktopMain/kotlin/it/mpp0/ExpectedClass.kt

-5
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package it.mpp0
2+
3+
actual class ExpectedClass2 {
4+
actual val platform: String = "desktop"
5+
}

dokka-integration-tests/gradle/projects/it-multiplatform-0/src/jsMain/kotlin/it/mpp0/ExpectedClass.kt

+4
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@ package it.mpp0
33
actual class ExpectedClass {
44
actual val platform: String = "js"
55
}
6+
7+
actual class ExpectedClass2 {
8+
actual val platform: String = "js"
9+
}

dokka-integration-tests/gradle/projects/it-multiplatform-0/src/jvmMain/kotlin/it/mpp0/ExpectedClass.kt

+4
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ actual class ExpectedClass {
99
fun jvmOnlyFunction() = Unit
1010

1111
}
12+
13+
actual class ExpectedClass2 {
14+
actual val platform: String = "jvm"
15+
}

dokka-integration-tests/gradle/projects/it-multiplatform-0/src/linuxMain/kotlin/it/mpp0/CPointerExtension.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ import kotlinx.cinterop.CPointer
66
/**
77
* Will print the raw value
88
*/
9-
fun CPointer<CPointed>.customExtension() {
9+
fun CPointer<CPointed>.customExtension2() {
1010
println(this.rawValue)
1111
}

dokka-integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt

+6-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ open class AllSupportedTestedVersionsArgumentsProvider : TestedVersionsArguments
1414

1515
object TestedVersions {
1616

17-
val LATEST = BuildVersions("8.7", "2.0.20")
17+
val LATEST = BuildVersions("8.10.2", "2.1.0")
1818

1919
/**
2020
* All supported Gradle/Kotlin versions, including [LATEST]
@@ -24,10 +24,10 @@ object TestedVersions {
2424
val ALL_SUPPORTED =
2525
BuildVersions.permutations(
2626
gradleVersions = listOf("7.6.2"),
27-
kotlinVersions = listOf("1.9.23", "1.8.20", "1.7.20", "1.6.21", "1.5.31"),
27+
kotlinVersions = listOf("2.0.21", "1.9.23", "1.8.20", "1.7.20", "1.6.21", "1.5.31"),
2828
) + BuildVersions.permutations(
2929
gradleVersions = listOf(*ifExhaustive("7.0", "6.1.1")),
30-
kotlinVersions = listOf(*ifExhaustive( "1.8.0", "1.7.0", "1.6.0", "1.5.0"))
30+
kotlinVersions = listOf(*ifExhaustive("1.8.0", "1.7.0", "1.6.0", "1.5.0"))
3131
) + LATEST
3232

3333
/**
@@ -41,7 +41,7 @@ object TestedVersions {
4141
val ANDROID =
4242
BuildVersions.permutations(
4343
gradleVersions = listOf("8.4"),
44-
kotlinVersions = listOf("2.0.20"),
44+
kotlinVersions = listOf("2.1.0", "2.0.21"),
4545
androidGradlePluginVersions = listOf("8.3.0")
4646
) + BuildVersions.permutations(
4747
gradleVersions = listOf("7.4.2", *ifExhaustive("7.0")),
@@ -67,7 +67,8 @@ object TestedVersions {
6767
"1.9.10" to "18.2.0-pre.597",
6868
"1.9.23" to "18.2.0-pre.682",
6969
"2.0.0" to "18.2.0-pre.726",
70-
"2.0.20" to "18.3.1-pre.758",
70+
"2.0.21" to "18.3.1-pre.758",
71+
"2.1.0" to "18.3.1-pre.818",
7172
)
7273
}
7374

dokka-integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/junit/TestedVersionsSource.kt

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ fun interface TestedVersionsSource<T : TestedVersions> {
4545
private val allKgpVersions: List<String> = listOf(
4646
"1.9.25",
4747
"2.0.21",
48+
"2.1.0",
4849
)
4950

5051
/**

0 commit comments

Comments
 (0)