diff options
author | Vadim Mishenev <vad-mishenev@yandex.ru> | 2023-07-21 15:19:17 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-21 15:19:17 +0300 |
commit | f5393dd740eaf533fe9ff51003b175ef1c1418fe (patch) | |
tree | 1c81e3a76c338c6281abdb946ae835e1d8a15225 /runners/gradle-plugin/src/test/kotlin/org/jetbrains | |
parent | 99062cbf5e332b3883c502da612d97f83eee9bff (diff) | |
download | dokka-f5393dd740eaf533fe9ff51003b175ef1c1418fe.tar.gz dokka-f5393dd740eaf533fe9ff51003b175ef1c1418fe.tar.bz2 dokka-f5393dd740eaf533fe9ff51003b175ef1c1418fe.zip |
Update Kotlin to 1.9.0 (#3074)
* Update Kotlin Gradle Plugin to 1.9.0
* Update Android Gradle Plugin to 4.2.2
* Introduce convention plugin for Gradle runner
https://github.com/gradle/gradle/issues/8301
* Fix unit test `common, jvm and macos source sets with kotlin multiplatform`
* Update compiler to 1.9.0
* Update integration test
* Add empty target for WASM integration test to avoid single target project
See https://github.com/Kotlin/dokka/issues/3038
* Remove unused `plugins.shadow` from toml
Diffstat (limited to 'runners/gradle-plugin/src/test/kotlin/org/jetbrains')
-rw-r--r-- | runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinSourceSetGistTest.kt | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinSourceSetGistTest.kt b/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinSourceSetGistTest.kt index 713109bf..88bef2b2 100644 --- a/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinSourceSetGistTest.kt +++ b/runners/gradle-plugin/src/test/kotlin/org/jetbrains/dokka/gradle/KotlinSourceSetGistTest.kt @@ -2,6 +2,7 @@ package org.jetbrains.dokka.gradle import org.jetbrains.dokka.gradle.utils.withDependencies_ import org.gradle.api.artifacts.FileCollectionDependency +import org.gradle.api.internal.project.DefaultProject import org.gradle.kotlin.dsl.get import org.gradle.testfixtures.ProjectBuilder import org.jetbrains.dokka.gradle.kotlin.gistOf @@ -163,6 +164,7 @@ class KotlinSourceSetGistTest { kotlin.jvm() kotlin.macosX64("macos") + (project as DefaultProject).evaluate() val commonMainSourceSet = kotlin.sourceSets.getByName("commonMain") val commonMainSourceSetGist = project.gistOf(commonMainSourceSet) @@ -232,17 +234,11 @@ class KotlinSourceSetGistTest { "Expected macosTest not being marked with 'isMain'" ) + // requires `project.evaluate()` assertEquals( setOf("commonMain"), jvmMainSourceSetGist.dependentSourceSetNames.get(), "Expected jvmMain to depend on commonMain by default" ) - - /* Why not? */ - jvmMainSourceSet.dependsOn(macosMainSourceSet) - assertEquals( - setOf("commonMain", "macosMain"), jvmMainSourceSetGist.dependentSourceSetNames.get(), - "Expected dependent source set changes to be reflected in gist" - ) } } |