aboutsummaryrefslogtreecommitdiff
path: root/runners/gradle-integration-tests
diff options
context:
space:
mode:
authorKamil Doległo <kamilok1965@interia.pl>2020-02-10 15:02:26 +0100
committerKamil Doległo <kamilok1965@interia.pl>2020-02-10 15:02:26 +0100
commit0d0d41f594f1095b4ccc999cffe01a6ef9a22dbb (patch)
tree32b09319400677750af154034e09d82d4706a396 /runners/gradle-integration-tests
parent23fbfa0e8e793314cea8d96ac1584d72ec70bb60 (diff)
parent465ea3d23be40d0d21df7f7cab51ec2d42e3237f (diff)
downloaddokka-0d0d41f594f1095b4ccc999cffe01a6ef9a22dbb.tar.gz
dokka-0d0d41f594f1095b4ccc999cffe01a6ef9a22dbb.tar.bz2
dokka-0d0d41f594f1095b4ccc999cffe01a6ef9a22dbb.zip
Merge dev-0.10.1 into master
Diffstat (limited to 'runners/gradle-integration-tests')
-rw-r--r--runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/MultiplatformProjectTest.kt4
-rw-r--r--runners/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle9
2 files changed, 7 insertions, 6 deletions
diff --git a/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/MultiplatformProjectTest.kt b/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/MultiplatformProjectTest.kt
index 3e61d79e..6ab9fd52 100644
--- a/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/MultiplatformProjectTest.kt
+++ b/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/MultiplatformProjectTest.kt
@@ -40,8 +40,8 @@ class MultiplatformProjectTest : AbstractDokkaGradleTest() {
checkNoUnresolvedLinks(docsOutput)
}
- @Test fun `test kotlin 1_3_30 and gradle 4_7`() {
- doTest("4.7", "1.3.30")
+ @Test fun `test kotlin 1_3_30 and gradle 4_9`() {
+ doTest("4.9", "1.3.30")
}
@Test fun `test kotlin 1_3_40 and gradle 4_10_3`() {
diff --git a/runners/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle b/runners/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle
index 8688ae41..444d2ab3 100644
--- a/runners/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle
+++ b/runners/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle
@@ -52,11 +52,12 @@ def configureDokkaTypeSafely(DokkaTask dokka) {
sourceRoot.path = "some String"
}
})
- externalDocumentationLink(new Action<GradleExternalDocumentationLinkImpl>() {
+ externalDocumentationLink(new Action<GradleExternalDocumentationLinkImpl.Builder>() {
@Override
- void execute(GradleExternalDocumentationLinkImpl link) {
- link.url = uri("some URI").toURL()
- link.packageListUrl = uri("some URI").toURL()
+ void execute(GradleExternalDocumentationLinkImpl.Builder builder) {
+ builder.url = uri("some URI").toURL()
+ builder.packageListUrl = uri("some URI").toURL()
+ builder.build()
}
})
kotlinTasks(new Callable<List<Object>>() {