From 1c4a3c6b21846271bcdba3818ba323d1b0bb096f Mon Sep 17 00:00:00 2001 From: Kamil Doległo Date: Thu, 22 Aug 2019 16:04:19 +0200 Subject: Merge Android plugin into Gradle plugin --- .../kotlin/org/jetbrains/dokka/gradle/AbstractDokkaAndroidGradleTest.kt | 2 +- .../test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaGradleTest.kt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'runners/gradle-integration-tests/src') diff --git a/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaAndroidGradleTest.kt b/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaAndroidGradleTest.kt index d6ed610a..334fc7c8 100644 --- a/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaAndroidGradleTest.kt +++ b/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaAndroidGradleTest.kt @@ -5,7 +5,7 @@ import java.io.File abstract class AbstractDokkaAndroidGradleTest : AbstractDokkaGradleTest() { - override val pluginClasspath: List = androidPluginClasspathData.toFile().readLines().map { File(it) } + override val pluginClasspath: List = pluginClasspathData.toFile().readLines().map { File(it) } companion object { diff --git a/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaGradleTest.kt b/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaGradleTest.kt index 6bd5786f..4814e707 100644 --- a/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaGradleTest.kt +++ b/runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaGradleTest.kt @@ -14,7 +14,6 @@ import java.nio.file.Paths val testDataFolder: Path = Paths.get("testData") val pluginClasspathData: Path = Paths.get("build", "createClasspathManifest", "dokka-plugin-classpath.txt") -val androidPluginClasspathData: Path = pluginClasspathData.resolveSibling("android-dokka-plugin-classpath.txt") val dokkaFatJarPathData: Path = pluginClasspathData.resolveSibling("fatjar.txt") -- cgit