diff options
| author | Błażej Kardyś <bkardys@virtuslab.com> | 2021-01-05 17:59:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-05 17:59:38 +0100 |
| commit | 1618e552c136e25d86bf0708e0d760841c77c139 (patch) | |
| tree | c608ce91b020bb0ecbfe75d0f456a0eae84b4c51 /integration-tests/gradle | |
| parent | ef98e4b6505c3fdd192b1d5057c718079d27b972 (diff) | |
| download | dokka-1618e552c136e25d86bf0708e0d760841c77c139.tar.gz dokka-1618e552c136e25d86bf0708e0d760841c77c139.tar.bz2 dokka-1618e552c136e25d86bf0708e0d760841c77c139.zip | |
Versioning (#1654)
* Adding versioning mechanism for multimodule
* Versioning improvement
* Refactor configuration, add ordering
* Fix integration tests
* Change packages, unignore test
Co-authored-by: Marcin Aman <marcin.aman@gmail.com>
Diffstat (limited to 'integration-tests/gradle')
4 files changed, 3 insertions, 4 deletions
diff --git a/integration-tests/gradle/projects/it-multimodule-1/second/build.gradle b/integration-tests/gradle/projects/it-multimodule-1/second/build.gradle index 188917bc..2b62f963 100644 --- a/integration-tests/gradle/projects/it-multimodule-1/second/build.gradle +++ b/integration-tests/gradle/projects/it-multimodule-1/second/build.gradle @@ -6,7 +6,7 @@ dokkaHtml { dokkaSourceSets { "main" { externalDocumentationLink { - url.set(new URL("file://" + rootProject.rootDir.toPath().toAbsolutePath().resolve("first/build/dokka/html/first/"))) + url.set(new URL("file://" + rootProject.rootDir.toPath().toAbsolutePath().resolve("first/build/dokka/html/"))) packageListUrl.set(new URL("file://" + rootProject.rootDir.toPath().toAbsolutePath().resolve("first/build/dokka/html/first/package-list"))) } } diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt index bfeed55e..216ff395 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt @@ -26,7 +26,6 @@ class Android0GradleIntegrationTest(override val versions: BuildVersions) : Abst ) } - @BeforeTest fun prepareProjectFiles() { assumeAndroidSdkInstalled() diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt index 33b4885e..d51f27e6 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt @@ -67,7 +67,7 @@ class BasicGradleIntegrationTest(override val versions: BuildVersions) : Abstrac val moduleOutputDir = File(this, "-basic -project") assertTrue(moduleOutputDir.isDirectory, "Missing module directory") - val moduleIndexHtml = File(moduleOutputDir, "index.html") + val moduleIndexHtml = File(this, "index.html") assertTrue(moduleIndexHtml.isFile, "Missing module index.html") val modulePackageDir = File(moduleOutputDir, "it.basic") diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGroovyIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGroovyIntegrationTest.kt index 0e125258..9746c8b8 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGroovyIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/BasicGroovyIntegrationTest.kt @@ -65,7 +65,7 @@ class BasicGroovyIntegrationTest(override val versions: BuildVersions) : Abstrac val moduleOutputDir = File(this, "it-basic-groovy") assertTrue(moduleOutputDir.isDirectory, "Missing module directory") - val moduleIndexHtml = File(moduleOutputDir, "index.html") + val moduleIndexHtml = File(this, "index.html") assertTrue(moduleIndexHtml.isFile, "Missing module index.html") val modulePackageDir = File(moduleOutputDir, "it.basic") |