aboutsummaryrefslogtreecommitdiff
path: root/runners/gradle-integration-tests/src
diff options
context:
space:
mode:
authorKamil Doległo <kamilok1965@interia.pl>2019-08-22 16:04:19 +0200
committerKamil Doległo <kamilok1965@interia.pl>2019-08-22 16:04:19 +0200
commit1c4a3c6b21846271bcdba3818ba323d1b0bb096f (patch)
treefa3a5e40d879bd1dbb284c69cee1b418f5044021 /runners/gradle-integration-tests/src
parente224c709692adf450786e16e245b4574a480cdab (diff)
downloaddokka-1c4a3c6b21846271bcdba3818ba323d1b0bb096f.tar.gz
dokka-1c4a3c6b21846271bcdba3818ba323d1b0bb096f.tar.bz2
dokka-1c4a3c6b21846271bcdba3818ba323d1b0bb096f.zip
Merge Android plugin into Gradle plugin
Diffstat (limited to 'runners/gradle-integration-tests/src')
-rw-r--r--runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaAndroidGradleTest.kt2
-rw-r--r--runners/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaGradleTest.kt1
2 files changed, 1 insertions, 2 deletions
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<File> = androidPluginClasspathData.toFile().readLines().map { File(it) }
+ override val pluginClasspath: List<File> = 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")