From 1618e552c136e25d86bf0708e0d760841c77c139 Mon Sep 17 00:00:00 2001 From: Błażej Kardyś Date: Tue, 5 Jan 2021 17:59:38 +0100 Subject: 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 --- .../org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt | 1 - .../kotlin/org/jetbrains/dokka/it/gradle/BasicGradleIntegrationTest.kt | 2 +- .../kotlin/org/jetbrains/dokka/it/gradle/BasicGroovyIntegrationTest.kt | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'integration-tests/gradle/src/integrationTest') 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") -- cgit