aboutsummaryrefslogtreecommitdiff
path: root/integration-tests
diff options
context:
space:
mode:
authorsebastian.sellmair <sebastian.sellmair@jetbrains.com>2020-07-07 07:47:11 +0200
committerPaweł Marks <Kordyjan@users.noreply.github.com>2020-07-07 08:29:04 +0200
commit33cf9d62f409dd5d98678fdcd29227763af11586 (patch)
treecc48eb6879648aeeea7177b640f8031971df5dc0 /integration-tests
parentdaadf8431b9280d5f96cfce2698b83c5e11524f6 (diff)
downloaddokka-33cf9d62f409dd5d98678fdcd29227763af11586.tar.gz
dokka-33cf9d62f409dd5d98678fdcd29227763af11586.tar.bz2
dokka-33cf9d62f409dd5d98678fdcd29227763af11586.zip
Remove old integration tests folder
Diffstat (limited to 'integration-tests')
-rw-r--r--integration-tests/gradle-integration-tests/README.md3
-rw-r--r--integration-tests/gradle-integration-tests/android-licenses/android-sdk-license2
-rw-r--r--integration-tests/gradle-integration-tests/android-licenses/android-sdk-preview-license2
-rw-r--r--integration-tests/gradle-integration-tests/build.gradle.kts45
-rw-r--r--integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractAndroidAppTest.kt51
-rw-r--r--integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaAndroidGradleTest.kt45
-rw-r--r--integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaGradleTest.kt108
-rw-r--r--integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidAppTest.kt25
-rw-r--r--integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidLibDependsOnJavaLibTest.kt48
-rw-r--r--integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidMultiFlavourAppTest.kt60
-rw-r--r--integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/BasicTest.kt60
-rw-r--r--integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/JavadocRSuppressionTest.kt24
-rw-r--r--integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/MultiProjectSingleOutTest.kt57
-rw-r--r--integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/MultiplatformProjectTest.kt54
-rw-r--r--integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/RebuildAfterSourceChangeTest.kt74
-rw-r--r--integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/TypeSafeConfigurationTest.kt36
-rw-r--r--integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/Utils.kt56
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidApp/app/build.gradle45
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/AndroidManifest.xml26
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java34
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt28
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-hdpi/ic_launcher.pngbin9397 -> 0 bytes
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-mdpi/ic_launcher.pngbin5237 -> 0 bytes
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-xhdpi/ic_launcher.pngbin14383 -> 0 bytes
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/layout/activity_main.xml24
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/layout/activity_main2.xml24
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/menu/main.xml6
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/menu/main_activity2.xml6
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/dimens.xml5
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/strings.xml10
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/styles.xml20
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidApp/build.gradle21
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidApp/fileTree.txt20
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidApp/settings.gradle3
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle49
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/AndroidManifest.xml26
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java34
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt28
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-hdpi/ic_launcher.pngbin9397 -> 0 bytes
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-mdpi/ic_launcher.pngbin5237 -> 0 bytes
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-xhdpi/ic_launcher.pngbin14383 -> 0 bytes
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/layout/activity_main.xml24
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/layout/activity_main2.xml24
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/menu/main.xml6
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/menu/main_activity2.xml6
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/dimens.xml5
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/strings.xml10
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/styles.xml20
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidAppJavadoc/build.gradle21
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidAppJavadoc/fileTree.txt21
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidAppJavadoc/settings.gradle3
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/build.gradle20
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/fileTree.txt14
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/jlib/build.gradle1
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/jlib/src/main/java/example/jlib/LibClz.java5
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle39
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/AndroidManifest.xml4
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/kotlin/example/LibClzUse.kt13
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/package-list1
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/settings.gradle5
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle75
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/AndroidManifest.xml9
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/kotlin/org/example/kotlin/mixed/free/AdActivity.kt14
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/res/layout/activity_ad.xml24
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/res/values/strings.xml3
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/AndroidManifest.xml26
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java34
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt28
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-hdpi/ic_launcher.pngbin9397 -> 0 bytes
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-mdpi/ic_launcher.pngbin5237 -> 0 bytes
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-xhdpi/ic_launcher.pngbin14383 -> 0 bytes
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/layout/activity_main.xml24
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/layout/activity_main2.xml24
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/menu/main.xml6
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/menu/main_activity2.xml6
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/values/dimens.xml5
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/values/strings.xml10
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/values/styles.xml20
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/build.gradle21
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/fileTree.txt47
-rw-r--r--integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/settings.gradle3
-rw-r--r--integration-tests/gradle-integration-tests/testData/basic/build.gradle46
-rw-r--r--integration-tests/gradle-integration-tests/testData/basic/classDir/p1/MyBinaryClass.classbin670 -> 0 bytes
-rw-r--r--integration-tests/gradle-integration-tests/testData/basic/fileTree.txt33
-rw-r--r--integration-tests/gradle-integration-tests/testData/basic/settings.gradle11
-rw-r--r--integration-tests/gradle-integration-tests/testData/basic/src/main/kotlin/demo/HelloWorld.kt45
-rw-r--r--integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/build.gradle37
-rw-r--r--integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/fileTree.txt33
-rw-r--r--integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/settings.gradle3
-rw-r--r--integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subA/build.gradle6
-rw-r--r--integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subA/src/main/kotlin/module.kt31
-rw-r--r--integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subB/build.gradle7
-rw-r--r--integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subB/src/main/kotlin/module.kt31
-rw-r--r--integration-tests/gradle-integration-tests/testData/multiplatformProject/build.gradle60
-rw-r--r--integration-tests/gradle-integration-tests/testData/multiplatformProject/fileTree.txt18
-rw-r--r--integration-tests/gradle-integration-tests/testData/multiplatformProject/settings.gradle1
-rw-r--r--integration-tests/gradle-integration-tests/testData/multiplatformProject/src/jsMain/kotlin/org/kotlintestmpp/main.kt14
-rw-r--r--integration-tests/gradle-integration-tests/testData/multiplatformProject/src/jvmMain/kotlin/org/kotlintestmpp/main.kt20
-rw-r--r--integration-tests/gradle-integration-tests/testData/sourcesChange/build.gradle35
-rw-r--r--integration-tests/gradle-integration-tests/testData/sourcesChange/fileTree.txt10
-rw-r--r--integration-tests/gradle-integration-tests/testData/sourcesChange/fileTree1.txt11
-rw-r--r--integration-tests/gradle-integration-tests/testData/sourcesChange/settings.gradle1
-rw-r--r--integration-tests/gradle-integration-tests/testData/sourcesChange/src/main/kotlin/demo/HelloWorld.kt6
-rw-r--r--integration-tests/gradle-integration-tests/testData/sourcesChange/src1/main/kotlin/demo/HelloWorld.kt11
-rw-r--r--integration-tests/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle73
-rw-r--r--integration-tests/gradle-integration-tests/testData/typeSafeConfiguration/settings.gradle1
106 files changed, 0 insertions, 2324 deletions
diff --git a/integration-tests/gradle-integration-tests/README.md b/integration-tests/gradle-integration-tests/README.md
deleted file mode 100644
index 5a3c3ff1..00000000
--- a/integration-tests/gradle-integration-tests/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# DEPRECATED
-
-This module has been deprecated in favor of `:integration-tests:gradle` and will be removed soon.
diff --git a/integration-tests/gradle-integration-tests/android-licenses/android-sdk-license b/integration-tests/gradle-integration-tests/android-licenses/android-sdk-license
deleted file mode 100644
index c311cf48..00000000
--- a/integration-tests/gradle-integration-tests/android-licenses/android-sdk-license
+++ /dev/null
@@ -1,2 +0,0 @@
-
-d56f5187479451eabf01fb78af6dfcb131a6481e \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/android-licenses/android-sdk-preview-license b/integration-tests/gradle-integration-tests/android-licenses/android-sdk-preview-license
deleted file mode 100644
index da4552d2..00000000
--- a/integration-tests/gradle-integration-tests/android-licenses/android-sdk-preview-license
+++ /dev/null
@@ -1,2 +0,0 @@
-
-84831b9409646a918e30573bab4c9c91346d8abd \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/build.gradle.kts b/integration-tests/gradle-integration-tests/build.gradle.kts
deleted file mode 100644
index 7cb96738..00000000
--- a/integration-tests/gradle-integration-tests/build.gradle.kts
+++ /dev/null
@@ -1,45 +0,0 @@
-val dokkaPlugin: Configuration by configurations.creating
-val dokkaCore: Configuration by configurations.creating
-val kotlinGradle: Configuration by configurations.creating
-
-repositories {
- maven(url = "https://kotlin.bintray.com/kotlin-plugin")
-}
-
-dependencies {
- val kotlin_version: String by project
- testCompileOnly("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version")
- testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
- testImplementation("junit:junit:4.13")
- testImplementation(gradleTestKit())
-
- dokkaPlugin(project(path = ":runners:gradle-plugin"))
- dokkaCore(project(path = ":core:dependencies", configuration = "shadow"))
- dokkaCore(project(path = ":core"))
- kotlinGradle("org.jetbrains.kotlin:kotlin-gradle-plugin")
-}
-
-val createClasspathManifest by tasks.registering {
- val outputDir = file("$buildDir/$name")
- inputs.files(dokkaPlugin + dokkaCore)
- outputs.dir(outputDir)
-
- doLast {
- outputDir.mkdirs()
- file("$outputDir/dokka-plugin-classpath.txt").writeText(dokkaPlugin.joinToString("\n"))
- file("$outputDir/fatjar.txt").writeText(dokkaCore.joinToString("\n"))
- file("$outputDir/kotlin-gradle.txt").writeText(kotlinGradle.joinToString("\n"))
- }
-}
-
-tasks {
- testClasses {
- dependsOn(createClasspathManifest)
- }
-
- test {
- systemProperty("android.licenses.overwrite", project.findProperty("android.licenses.overwrite") ?: "")
- inputs.dir(file("testData"))
- exclude("*") // TODO: Remove this exclude when tests are migrated
- }
-}
diff --git a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractAndroidAppTest.kt b/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractAndroidAppTest.kt
deleted file mode 100644
index c3fe2ea9..00000000
--- a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractAndroidAppTest.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.jetbrains.dokka.gradle
-
-import org.gradle.testkit.runner.TaskOutcome
-import kotlin.test.assertEquals
-
-abstract class AbstractAndroidAppTest(val testDataRootPath: String) : AbstractDokkaAndroidGradleTest() {
-
- fun prepareTestData() {
- val testDataRoot = testDataFolder.resolve(testDataRootPath)
- val tmpRoot = testProjectDir.root.toPath()
-
- testDataRoot.resolve("app").copy(tmpRoot.resolve("app"))
- testDataRoot.resolve("build.gradle").copy(tmpRoot.resolve("build.gradle"))
- testDataRoot.resolve("settings.gradle").copy(tmpRoot.resolve("settings.gradle"))
-
- androidLocalProperties?.copy(tmpRoot.resolve("local.properties"))
- }
-
-
- data class AndroidPluginParams(val pluginVersion: String, val buildToolsVersion: String, val compileSdk: Int) {
- fun asArguments(): List<String> = listOf(
- "-Pabt_plugin_version=$pluginVersion",
- "-Pabt_version=$buildToolsVersion",
- "-Psdk_version=$compileSdk"
- )
- }
-
-
- protected fun doTest(gradleVersion: String, kotlinVersion: String, androidPluginParams: AndroidPluginParams) {
- prepareTestData()
-
- val result = configure(gradleVersion, kotlinVersion,
- arguments = arrayOf("dokka", "--stacktrace") + androidPluginParams.asArguments())
- .build()
-
- println(result.output)
-
- assertEquals(TaskOutcome.SUCCESS, result.task(":app:dokka")?.outcome)
-
- val docsOutput = "app/build/dokka"
-
- checkOutputStructure("$testDataRootPath/fileTree.txt", docsOutput)
-
- checkNoErrorClasses(docsOutput)
- checkNoUnresolvedLinks(docsOutput)
-
- checkExternalLink(docsOutput, "<span class=\"identifier\">Activity</span>",
- """<a href="https://developer.android.com/reference/android/app/Activity.html"><span class="identifier">Activity</span></a>""")
- }
-
-} \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaAndroidGradleTest.kt b/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaAndroidGradleTest.kt
deleted file mode 100644
index 334fc7c8..00000000
--- a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaAndroidGradleTest.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.jetbrains.dokka.gradle
-
-import org.junit.BeforeClass
-import java.io.File
-
-abstract class AbstractDokkaAndroidGradleTest : AbstractDokkaGradleTest() {
-
- override val pluginClasspath: List<File> = pluginClasspathData.toFile().readLines().map { File(it) }
-
- companion object {
-
- @JvmStatic
- @BeforeClass
- fun acceptAndroidSdkLicenses() {
- val sdkDir = androidLocalProperties?.toFile()?.let {
- val lines = it.readLines().map { it.trim() }
- val sdkDirLine = lines.firstOrNull { "sdk.dir" in it }
- sdkDirLine?.substringAfter("=")?.trim()
- } ?: System.getenv("ANDROID_HOME")
-
- if (sdkDir == null || sdkDir.isEmpty()) {
- error("Android SDK home not set, " +
- "try setting \$ANDROID_HOME " +
- "or sdk.dir in runners/gradle-integration-tests/testData/android.local.properties")
- }
- val sdkDirFile = File(sdkDir)
- if (!sdkDirFile.exists()) error("\$ANDROID_HOME and android.local.properties points to non-existing location")
- val sdkLicensesDir = sdkDirFile.resolve("licenses")
-
- val acceptedLicenses = File("android-licenses")
- acceptedLicenses.listFiles().forEach { licenseFile ->
- val target = sdkLicensesDir.resolve(licenseFile.name)
- if(!target.exists() || target.readText() != licenseFile.readText()) {
- val overwrite = System.getProperty("android.licenses.overwrite", "false")!!.toBoolean()
- if (!target.exists() || overwrite) {
- licenseFile.copyTo(target, true)
- println("Accepted ${licenseFile.name}, by copying $licenseFile to $target")
- }
- }
-
- }
- }
-
- }
-} \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaGradleTest.kt b/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaGradleTest.kt
deleted file mode 100644
index b2ec1bfb..00000000
--- a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaGradleTest.kt
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.jetbrains.dokka.gradle
-
-
-import org.gradle.testkit.runner.GradleRunner
-import org.junit.ComparisonFailure
-import org.junit.Rule
-import org.junit.rules.TemporaryFolder
-import java.io.File
-import java.nio.file.Files
-import java.nio.file.Path
-import java.nio.file.Paths
-
-
-val testDataFolder: Path = Paths.get("testData")
-
-val pluginClasspathData: Path = Paths.get("build", "createClasspathManifest", "dokka-plugin-classpath.txt")
-
-val dokkaFatJarPathData: Path = pluginClasspathData.resolveSibling("fatjar.txt")
-
-val androidLocalProperties = testDataFolder.resolve("android.local.properties").let { if (Files.exists(it)) it else null }
-
-abstract class AbstractDokkaGradleTest {
- @get:Rule val testProjectDir = TemporaryFolder()
-
- open val pluginClasspath: List<File> = pluginClasspathData.toFile().readLines().map { File(it) }
-
- fun checkOutputStructure(expected: String, actualSubpath: String) {
- val expectedPath = testDataFolder.resolve(expected)
- val actualPath = testProjectDir.root.toPath().resolve(actualSubpath).normalize()
-
- assertEqualsIgnoringSeparators(expectedPath.toFile(), buildString {
- actualPath.toFile().writeStructure(this, File(actualPath.toFile(), "."))
- })
- }
-
- fun checkNoErrorClasses(actualSubpath: String, extension: String = "html", errorClassMarker: String = "ERROR CLASS") {
- val actualPath = testProjectDir.root.toPath().resolve(actualSubpath).normalize()
- var checked = 0
- Files.walk(actualPath).filter { Files.isRegularFile(it) && it.fileName.toString().endsWith(".$extension") }.forEach {
- val text = it.toFile().readText()
-
- val noErrorClasses = text.replace(errorClassMarker, "?!")
-
- if (noErrorClasses != text) {
- throw ComparisonFailure("", noErrorClasses, text)
- }
-
- checked++
- }
- println("$checked files checked for error classes")
- }
-
- fun checkNoUnresolvedLinks(actualSubpath: String, extension: String = "html", marker: Regex = "[\"']#[\"']".toRegex()) {
- val actualPath = testProjectDir.root.toPath().resolve(actualSubpath).normalize()
- var checked = 0
- Files.walk(actualPath).filter { Files.isRegularFile(it) && it.fileName.toString().endsWith(".$extension") }.forEach {
- val text = it.toFile().readText()
-
- val noErrorClasses = text.replace(marker, "?!")
-
- if (noErrorClasses != text) {
- throw ComparisonFailure("", noErrorClasses, text)
- }
-
- checked++
- }
- println("$checked files checked for unresolved links")
- }
-
- fun checkExternalLink(actualSubpath: String, linkBody: String, fullLink: String, extension: String = "html") {
- val match = "!!match!!"
- val notMatch = "!!not-match!!"
-
- val actualPath = testProjectDir.root.toPath().resolve(actualSubpath).normalize()
- var checked = 0
- var totalEntries = 0
- Files.walk(actualPath).filter { Files.isRegularFile(it) && it.fileName.toString().endsWith(".$extension") }.forEach {
- val text = it.toFile().readText()
-
- val textWithoutMatches = text.replace(fullLink, match)
-
- val textWithoutNonMatches = textWithoutMatches.replace(linkBody, notMatch)
-
- if (textWithoutNonMatches != textWithoutMatches) {
-
- val expected = textWithoutNonMatches.replace(notMatch, fullLink).replace(match, fullLink)
- val actual = textWithoutMatches.replace(match, fullLink)
-
- throw ComparisonFailure("", expected, actual)
- }
- if (text != textWithoutMatches)
- totalEntries++
-
- checked++
- }
- println("$checked files checked for valid external links '$linkBody', found $totalEntries links")
- }
-
- fun configure(gradleVersion: String = "3.5", kotlinVersion: String = "1.1.2", arguments: Array<String>): GradleRunner {
- val fatjar = dokkaFatJarPathData.toFile().readText()
-
- return GradleRunner.create().withProjectDir(testProjectDir.root)
- .withArguments("-Pdokka_fatjar=$fatjar", "-Ptest_kotlin_version=$kotlinVersion", *arguments)
- .withPluginClasspath(pluginClasspath)
- .withGradleVersion(gradleVersion)
- .withDebug(true)
- }
-} \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidAppTest.kt b/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidAppTest.kt
deleted file mode 100644
index bbb63909..00000000
--- a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidAppTest.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.jetbrains.dokka.gradle
-
-import org.junit.Test
-
-class AndroidAppTest : AbstractAndroidAppTest("androidApp") {
- @Test
- fun `test kotlin 1_1_2-5 and gradle 4_0 and abt 3_0_0-alpha3`() {
- doTest("4.0", "1.1.2-5", AndroidPluginParams("3.0.0-alpha3", "25.0.2", 25))
- }
-
- @Test
- fun `test kotlin 1_1_2 and gradle 3_5 and abt 2_3_0`() {
- doTest("3.5", "1.1.2", AndroidPluginParams("2.3.0", "25.0.0", 24))
- }
-
- @Test
- fun `test kotlin 1_0_7 and gradle 2_14_1 and abt 2_2_3`() {
- doTest("2.14.1", "1.0.7", AndroidPluginParams("2.2.3", "25.0.0", 24))
- }
-
- @Test
- fun `test kotlin 1_2_20 and gradle 4_5 and abt 3_0_1`() {
- doTest("4.5", "1.2.20", AndroidPluginParams("3.0.1", "27.0.0", 27))
- }
-} \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidLibDependsOnJavaLibTest.kt b/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidLibDependsOnJavaLibTest.kt
deleted file mode 100644
index 9bc52273..00000000
--- a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidLibDependsOnJavaLibTest.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.jetbrains.dokka.gradle
-
-import org.gradle.testkit.runner.TaskOutcome
-import org.junit.Test
-import kotlin.test.assertEquals
-
-class AndroidLibDependsOnJavaLibTest: AbstractDokkaAndroidGradleTest() {
-
- private val testDataRootPath = "androidLibDependsOnJavaLib"
-
- private fun prepareTestData() {
- val testDataRoot = testDataFolder.resolve(testDataRootPath)
- val tmpRoot = testProjectDir.root.toPath()
-
- testDataRoot.copy(tmpRoot)
-
- androidLocalProperties?.copy(tmpRoot.resolve("local.properties"))
- }
-
-
- private fun doTest(gradleVersion: String, kotlinVersion: String, androidPluginParams: AbstractAndroidAppTest.AndroidPluginParams) {
- prepareTestData()
-
- val result = configure(gradleVersion, kotlinVersion,
- arguments = arrayOf("dokka", "--stacktrace") + androidPluginParams.asArguments())
- .build()
-
- println(result.output)
-
- assertEquals(TaskOutcome.SUCCESS, result.task(":lib:dokka")?.outcome)
-
- val docsOutput = "lib/build/dokka"
-
- checkOutputStructure("$testDataRootPath/fileTree.txt", docsOutput)
-
- checkNoErrorClasses(docsOutput)
- checkNoUnresolvedLinks(docsOutput)
-
- checkExternalLink(docsOutput, "<span class=\"identifier\">LibClz</span>",
- """<a href="https://example.com/example/jlib/LibClz.html"><span class="identifier">LibClz</span></a>""")
- }
-
-
- @Test
- fun `test kotlin 1_2_20 and gradle 4_5 and abt 3_0_1`() {
- doTest("4.5", "1.2.20", AbstractAndroidAppTest.AndroidPluginParams("3.0.1", "27.0.0", 27))
- }
-} \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidMultiFlavourAppTest.kt b/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidMultiFlavourAppTest.kt
deleted file mode 100644
index ef1b94d8..00000000
--- a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/AndroidMultiFlavourAppTest.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.jetbrains.dokka.gradle
-
-import org.gradle.testkit.runner.TaskOutcome
-import org.jetbrains.dokka.gradle.AbstractAndroidAppTest.AndroidPluginParams
-import org.junit.Test
-import kotlin.test.assertEquals
-
-class AndroidMultiFlavourAppTest : AbstractDokkaAndroidGradleTest() {
-
- fun prepareTestData(testDataRootPath: String) {
- val testDataRoot = testDataFolder.resolve(testDataRootPath)
- val tmpRoot = testProjectDir.root.toPath()
-
- testDataRoot.resolve("app").copy(tmpRoot.resolve("app"))
- testDataRoot.resolve("build.gradle").copy(tmpRoot.resolve("build.gradle"))
- testDataRoot.resolve("settings.gradle").copy(tmpRoot.resolve("settings.gradle"))
-
- androidLocalProperties?.copy(tmpRoot.resolve("local.properties"))
- }
-
- private fun doTest(gradleVersion: String, kotlinVersion: String, androidPluginParams: AndroidPluginParams) {
- prepareTestData("androidMultiFlavourApp")
-
- val result = configure(gradleVersion, kotlinVersion,
- arguments = arrayOf("dokka", "dokkaFullFlavourOnly", "--stacktrace") + androidPluginParams.asArguments())
- .build()
-
- println(result.output)
-
- assertEquals(TaskOutcome.SUCCESS, result.task(":app:dokka")?.outcome)
- assertEquals(TaskOutcome.SUCCESS, result.task(":app:dokkaFullFlavourOnly")?.outcome)
-
- val docsOutput = "app/build/dokka"
-
- checkOutputStructure("androidMultiFlavourApp/fileTree.txt", docsOutput)
-
- checkNoErrorClasses(docsOutput)
- checkNoUnresolvedLinks(docsOutput)
-
- checkExternalLink(docsOutput, "<span class=\"identifier\">Activity</span>",
- """<a href="https://developer.android.com/reference/android/app/Activity.html"><span class="identifier">Activity</span></a>""")
- }
-
- @Test fun `test kotlin 1_1_2-5 and gradle 4_0 and abt 3_0_0-alpha3`() {
- doTest("4.0", "1.1.2-5", AndroidPluginParams("3.0.0-alpha3", "25.0.2", 25))
- }
-
- @Test fun `test kotlin 1_1_2 and gradle 3_5 and abt 2_3_0`() {
- doTest("3.5", "1.1.2", AndroidPluginParams("2.3.0", "25.0.0", 24))
- }
-
- @Test fun `test kotlin 1_0_7 and gradle 2_14_1 and abt 2_2_3`() {
- doTest("2.14.1", "1.0.7", AndroidPluginParams("2.2.3", "25.0.0", 24))
- }
-
- @Test fun `test kotlin 1_2_20 and gradle 4_5 and abt 3_0_1`() {
- doTest("4.5", "1.2.20", AndroidPluginParams("3.0.1", "27.0.0", 27))
- }
-
-} \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/BasicTest.kt b/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/BasicTest.kt
deleted file mode 100644
index 38516b48..00000000
--- a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/BasicTest.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.jetbrains.dokka.gradle
-
-import org.gradle.testkit.runner.TaskOutcome
-import org.junit.Test
-import kotlin.test.assertEquals
-
-class BasicTest : AbstractDokkaGradleTest() {
-
- fun prepareTestData(testDataRootPath: String) {
- val testDataRoot = testDataFolder.resolve(testDataRootPath)
- val tmpRoot = testProjectDir.root.toPath()
-
- testDataRoot.resolve("src").copy(tmpRoot.resolve("src"))
- testDataRoot.resolve("classDir").copy(tmpRoot.resolve("classDir"))
- testDataRoot.resolve("build.gradle").copy(tmpRoot.resolve("build.gradle"))
- testDataRoot.resolve("settings.gradle").copy(tmpRoot.resolve("settings.gradle"))
- }
-
- private fun doTest(gradleVersion: String, kotlinVersion: String) {
-
- prepareTestData("basic")
-
- val result = configure(gradleVersion, kotlinVersion, arguments = arrayOf("dokka", "--stacktrace")).build()
-
- println(result.output)
-
- assertEquals(TaskOutcome.SUCCESS, result.task(":dokka")?.outcome)
-
- val docsOutput = "build/dokka"
-
- checkOutputStructure("basic/fileTree.txt", docsOutput)
-
- checkNoErrorClasses(docsOutput)
- checkNoUnresolvedLinks(docsOutput)
-
- checkExternalLink(docsOutput, "<span class=\"identifier\">String</span>",
- """<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a>""")
- }
-
- @Test
- fun `test gradle 6_5_1 kotlin 1_3_72`() {
- doTest(gradleVersion = "6.5.1", kotlinVersion = "1.3.72")
- }
-
- @Test
- fun `test gradle 6_5_0 kotlin 1_3_72`() {
- doTest(gradleVersion = "6.5.0", kotlinVersion = "1.3.72")
- }
-
- @Test
- fun `test gradle 5_6_4 kotlin 1_3_72`() {
- doTest(gradleVersion = "5.6.4", kotlinVersion = "1.3.72")
- }
-
- @Test
- fun `test gradle 5_6_4 kotlin 1_3_30`() {
- doTest(gradleVersion = "5.6.4", kotlinVersion = "1.3.30")
- }
-
-}
diff --git a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/JavadocRSuppressionTest.kt b/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/JavadocRSuppressionTest.kt
deleted file mode 100644
index 3a4d08b8..00000000
--- a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/JavadocRSuppressionTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.jetbrains.dokka.gradle
-
-import org.junit.Test
-
-class JavadocRSuppressionTest : AbstractAndroidAppTest("androidAppJavadoc") {
- @Test
- fun `test kotlin 1_1_2-5 and gradle 4_0 and abt 3_0_0-alpha3`() {
- doTest("4.0", "1.1.2-5", AndroidPluginParams("3.0.0-alpha3", "25.0.2", 25))
- }
-
- @Test
- fun `test kotlin 1_1_2 and gradle 3_5 and abt 2_3_0`() {
- doTest("3.5", "1.1.2", AndroidPluginParams("2.3.0", "25.0.0", 24))
- }
-
- @Test
- fun `test kotlin 1_0_7 and gradle 2_14_1 and abt 2_2_3`() {
- doTest("2.14.1", "1.0.7", AndroidPluginParams("2.2.3", "25.0.0", 24))
- }
-
- @Test fun `test kotlin 1_2_20 and gradle 4_5 and abt 3_0_1`() {
- doTest("4.5", "1.2.20", AndroidPluginParams("3.0.1", "27.0.0", 27))
- }
-} \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/MultiProjectSingleOutTest.kt b/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/MultiProjectSingleOutTest.kt
deleted file mode 100644
index 9458528c..00000000
--- a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/MultiProjectSingleOutTest.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.jetbrains.dokka.gradle
-
-import org.gradle.testkit.runner.TaskOutcome
-import org.junit.Test
-import kotlin.test.assertEquals
-
-class MultiProjectSingleOutTest : AbstractDokkaGradleTest() {
-
- fun prepareTestData(testDataRootPath: String) {
- val testDataRoot = testDataFolder.resolve(testDataRootPath)
- val tmpRoot = testProjectDir.root.toPath()
-
- testDataRoot.apply {
- resolve("build.gradle").copy(tmpRoot.resolve("build.gradle"))
- resolve("settings.gradle").copy(tmpRoot.resolve("settings.gradle"))
- resolve("subA").copy(tmpRoot.resolve("subA"))
- resolve("subB").copy(tmpRoot.resolve("subB"))
- }
- }
-
- private fun doTest(gradleVersion: String, kotlinVersion: String) {
-
- prepareTestData("multiProjectSingleOut")
-
- val result = configure(gradleVersion, kotlinVersion, arguments = arrayOf("dokka", "--stacktrace")).build()
-
- println(result.output)
-
- assertEquals(TaskOutcome.SUCCESS, result.task(":dokka")?.outcome)
-
- val docsOutput = "build/dokka"
-
- checkOutputStructure("multiProjectSingleOut/fileTree.txt", docsOutput)
-
- checkNoErrorClasses(docsOutput)
- checkNoUnresolvedLinks(docsOutput)
-
- checkExternalLink(docsOutput, "<span class=\"identifier\">String</span>",
- """<a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html"><span class="identifier">String</span></a>""")
- }
-
- @Test fun `test kotlin 1_1_2 and gradle 3_5`() {
- doTest("3.5", "1.1.2")
- }
-
- @Test fun `test kotlin 1_0_7 and gradle 2_14_1`() {
- doTest("2.14.1", "1.0.7")
- }
-
- @Test fun `test kotlin 1_1_2 and gradle 4_0`() {
- doTest("4.0", "1.1.2")
- }
-
- @Test fun `test kotlin 1_2_20 and gradle 4_5`() {
- doTest("4.5", "1.2.20")
- }
-} \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/MultiplatformProjectTest.kt b/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/MultiplatformProjectTest.kt
deleted file mode 100644
index 3e61d79e..00000000
--- a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/MultiplatformProjectTest.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.jetbrains.dokka.gradle
-
-import org.gradle.testkit.runner.TaskOutcome
-import org.junit.Test
-import java.io.File
-import kotlin.test.assertEquals
-
-class MultiplatformProjectTest : AbstractDokkaGradleTest() {
-
- fun prepareTestData(testDataRootPath: String) {
- val testDataRoot = testDataFolder.resolve(testDataRootPath)
- val tmpRoot = testProjectDir.root.toPath()
-
- testDataRoot.apply {
- resolve("build.gradle").copy(tmpRoot.resolve("build.gradle"))
- resolve("settings.gradle").copy(tmpRoot.resolve("settings.gradle"))
- resolve("src").copy(tmpRoot.resolve("src"))
- }
- }
-
- private fun doTest(gradleVersion: String, kotlinVersion: String) {
- val kotlinGradlePlugin = pluginClasspathData.resolveSibling("kotlin-gradle.txt").toFile().readLines().map { File(it) }
- prepareTestData("multiplatformProject")
-
- // Remove withDebug(false) when https://github.com/gradle/gradle/issues/6862 is solved
- val result = configure(gradleVersion, kotlinVersion, arguments = arrayOf("dokka", "--stacktrace"))
- .withDebug(false)
- .withPluginClasspath(pluginClasspath.union(kotlinGradlePlugin))
- .build()
-
- println(result.output)
-
- assertEquals(TaskOutcome.SUCCESS, result.task(":dokka")?.outcome)
-
- val docsOutput = "build/dokka"
-
- checkOutputStructure("multiplatformProject/fileTree.txt", docsOutput)
-
- checkNoErrorClasses(docsOutput)
- 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_40 and gradle 4_10_3`() {
- doTest("4.10.3", "1.3.40")
- }
-
- @Test fun `test kotlin 1_3_40 and gradle 5_6_1`() {
- doTest("5.6.1", "1.3.50")
- }
-} \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/RebuildAfterSourceChangeTest.kt b/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/RebuildAfterSourceChangeTest.kt
deleted file mode 100644
index 8b2db560..00000000
--- a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/RebuildAfterSourceChangeTest.kt
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.jetbrains.dokka.gradle
-
-import org.gradle.testkit.runner.TaskOutcome
-import org.junit.Test
-import java.nio.file.Path
-import kotlin.test.assertEquals
-
-class RebuildAfterSourceChangeTest : AbstractDokkaGradleTest() {
-
- fun prepareTestData(testDataRootPath: String): Pair<Path, Path> {
- val testDataRoot = testDataFolder.resolve(testDataRootPath)
- val tmpRoot = testProjectDir.root.toPath()
-
- testDataRoot.resolve("src").copy(tmpRoot.resolve("src"))
- testDataRoot.resolve("build.gradle").copy(tmpRoot.resolve("build.gradle"))
- testDataRoot.resolve("settings.gradle").copy(tmpRoot.resolve("settings.gradle"))
-
- return testDataRoot to tmpRoot
- }
-
- private fun doTest(gradleVersion: String, kotlinVersion: String) {
-
- val (testDataRoot, tmpRoot) = prepareTestData("sourcesChange")
- val docsOutput = "build/dokka"
-
- configure(gradleVersion, kotlinVersion, arguments = arrayOf("dokka", "--stacktrace")).build().let { result ->
- println(result.output)
-
- assertEquals(TaskOutcome.SUCCESS, result.task(":dokka")?.outcome)
- }
-
-
- configure(gradleVersion, kotlinVersion, arguments = arrayOf("dokka", "-i", "--stacktrace")).build().let { result ->
- println(result.output)
-
- assertEquals(TaskOutcome.UP_TO_DATE, result.task(":dokka")?.outcome)
- }
-
- checkOutputStructure("sourcesChange/fileTree.txt", docsOutput)
-
- testDataRoot.resolve("src1").copy(tmpRoot.resolve("src"))
-
- configure(gradleVersion, kotlinVersion, arguments = arrayOf("dokka", "--stacktrace")).build().let { result ->
- println(result.output)
-
- assertEquals(TaskOutcome.SUCCESS, result.task(":dokka")?.outcome)
- }
-
-
- checkOutputStructure("sourcesChange/fileTree1.txt", docsOutput)
-
- }
-
-
- @Test
- fun `test kotlin 1_0_7 and gradle 2_14_1`() {
- doTest("2.14.1", "1.0.7")
- }
-
- @Test
- fun `test kotlin 1_1_2 and gradle 3_5`() {
- doTest("3.5", "1.1.2")
- }
-
- @Test
- fun `test kotlin 1_1_2 and gradle 4_0`() {
- doTest("4.0", "1.1.2")
- }
-
- @Test
- fun `test kotlin 1_2_20 and gradle 4_5`() {
- doTest("4.5", "1.2.20")
- }
-} \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/TypeSafeConfigurationTest.kt b/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/TypeSafeConfigurationTest.kt
deleted file mode 100644
index 7b179e92..00000000
--- a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/TypeSafeConfigurationTest.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.jetbrains.dokka.gradle
-
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.Parameterized
-
-@RunWith(Parameterized::class)
-class TypeSafeConfigurationTest(private val testCase: TestCase) : AbstractDokkaGradleTest() {
-
- data class TestCase(val gradleVersion: String, val kotlinVersion: String) {
- override fun toString(): String = "Gradle $gradleVersion and Kotlin $kotlinVersion"
- }
-
- companion object {
- @Parameterized.Parameters(name = "{0}")
- @JvmStatic
- fun testCases() = listOf(
- TestCase("4.0", "1.1.2"),
- TestCase("4.5", "1.2.20"),
- TestCase("4.10.1", "1.2.60")
- )
- }
-
- @Test
- fun test() {
-
- testDataFolder.resolve("typeSafeConfiguration").toFile()
- .copyRecursively(testProjectDir.root)
-
- configure(
- testCase.gradleVersion,
- testCase.kotlinVersion,
- arguments = arrayOf("help", "-s")
- ).build()
- }
-}
diff --git a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/Utils.kt b/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/Utils.kt
deleted file mode 100644
index c7ced70b..00000000
--- a/integration-tests/gradle-integration-tests/src/test/kotlin/org/jetbrains/dokka/gradle/Utils.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.jetbrains.dokka.gradle
-
-import org.junit.ComparisonFailure
-import java.io.File
-import java.io.IOException
-import java.nio.file.*
-import java.nio.file.attribute.BasicFileAttributes
-
-
-fun File.writeStructure(builder: StringBuilder, relativeTo: File = this, spaces: Int = 0) {
- builder.append(" ".repeat(spaces))
- val out = if (this != relativeTo) this.relativeTo(relativeTo) else this
-
- builder.append(out)
- if (this.isDirectory) {
- builder.appendln("/")
- this.listFiles().sortedBy { it.name }.forEach { it.writeStructure(builder, this, spaces + 4) }
- } else {
- builder.appendln()
- }
-}
-
-fun assertEqualsIgnoringSeparators(expectedFile: File, output: String) {
- if (!expectedFile.exists()) expectedFile.createNewFile()
- val expectedText = expectedFile.readText().replace("\r\n", "\n")
- val actualText = output.replace("\r\n", "\n")
-
- if (expectedText != actualText)
- throw ComparisonFailure("Output differs! Expected file path: ${expectedFile.canonicalPath}", expectedText, actualText)
-}
-
-class CopyFileVisitor(private var sourcePath: Path?, private val targetPath: Path) : SimpleFileVisitor<Path>() {
-
- @Throws(IOException::class)
- override fun preVisitDirectory(dir: Path,
- attrs: BasicFileAttributes): FileVisitResult {
- if (sourcePath == null) {
- sourcePath = dir
- } else {
- Files.createDirectories(targetPath.resolve(sourcePath?.relativize(dir)))
- }
- return FileVisitResult.CONTINUE
- }
-
- @Throws(IOException::class)
- override fun visitFile(file: Path,
- attrs: BasicFileAttributes): FileVisitResult {
- Files.copy(file, targetPath.resolve(sourcePath?.relativize(file)), StandardCopyOption.REPLACE_EXISTING)
- return FileVisitResult.CONTINUE
- }
-}
-
-fun Path.copy(to: Path) {
- Files.walkFileTree(this, CopyFileVisitor(this, to))
-}
-
diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/build.gradle b/integration-tests/gradle-integration-tests/testData/androidApp/app/build.gradle
deleted file mode 100644
index 0092b76c..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidApp/app/build.gradle
+++ /dev/null
@@ -1,45 +0,0 @@
-buildscript {
- repositories {
- jcenter()
- mavenLocal()
- }
- dependencies {
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$test_kotlin_version"
- }
-}
-
-plugins {
- id 'org.jetbrains.dokka'
-}
-
-
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-
-android {
- compileSdkVersion Integer.parseInt(sdk_version)
- buildToolsVersion abt_version
-
- defaultConfig {
- applicationId "org.example.kotlin.mixed"
- minSdkVersion 14
- targetSdkVersion Integer.parseInt(sdk_version)
- versionCode 1
- versionName "1.0"
- }
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt')
- }
- }
- sourceSets {
- main.java.srcDirs += 'src/main/kotlin'
- }
-}
-
-dependencies {
- compile "org.jetbrains.kotlin:kotlin-stdlib:$test_kotlin_version"
- dokkaRuntime files(dokka_fatjar)
-}
diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/AndroidManifest.xml b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/AndroidManifest.xml
deleted file mode 100644
index b4e1a892..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.example.kotlin.mixed" >
-
- <application
- android:allowBackup="true"
- android:icon="@drawable/ic_launcher"
- android:label="@string/app_name"
- android:theme="@style/AppTheme" >
-
- <activity
- android:name=".JavaActivity"
- android:label="@string/title_activity_main_activity1" >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
-
- <activity
- android:name=".KotlinActivity"
- android:label="@string/title_activity_main_activity2" />
-
- </application>
-
-</manifest>
diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java
deleted file mode 100644
index 3668c594..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.example.kotlin.mixed;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.app.Activity;
-import android.view.Menu;
-import android.view.View;
-import android.widget.Button;
-
-public class JavaActivity extends Activity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
-
- Button next = (Button) findViewById(R.id.Button01);
- next.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- Intent myIntent = new Intent(view.getContext(), KotlinActivity.class);
- startActivityForResult(myIntent, 0);
- }
- });
- }
-
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate the menu; this adds items to the action bar if it is present.
- getMenuInflater().inflate(R.menu.main, menu);
- return true;
- }
-
-}
diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt
deleted file mode 100644
index ca2f27b0..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.example.kotlin.mixed
-
-import android.content.Intent
-import android.os.Bundle
-import android.app.Activity
-import android.view.Menu
-import android.widget.Button
-
-class KotlinActivity : Activity() {
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- setContentView(R.layout.activity_main2)
-
- val next = findViewById(R.id.Button02) as Button
- next.setOnClickListener {
- val intent: Intent = Intent()
- setResult(RESULT_OK, intent)
- finish()
- }
- }
-
- override fun onCreateOptionsMenu(menu: Menu?): Boolean {
- // Inflate the menu; this adds items to the action bar if it is present.
- menuInflater.inflate(R.menu.main_activity2, menu)
- return true
- }
-}
diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-hdpi/ic_launcher.png b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 96a442e5..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-mdpi/ic_launcher.png b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 359047df..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-xhdpi/ic_launcher.png b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 71c6d760..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/layout/activity_main.xml b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index ede57c39..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin"
- android:paddingBottom="@dimen/activity_vertical_margin"
- tools:context=".MainActivity">
-
- <TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="Activity 1" />
-
- <Button android:text="Next"
- android:id="@+id/Button01"
- android:layout_width="250px"
- android:textSize="18px"
- android:layout_height="55px">
- </Button>
-
-</LinearLayout>
diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/layout/activity_main2.xml b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/layout/activity_main2.xml
deleted file mode 100644
index d707536a..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/layout/activity_main2.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin"
- android:paddingBottom="@dimen/activity_vertical_margin"
- tools:context=".MainActivity">
-
- <TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="Activity 2" />
-
- <Button android:text="Next"
- android:id="@+id/Button02"
- android:layout_width="250px"
- android:textSize="18px"
- android:layout_height="55px">
- </Button>
-
-</LinearLayout>
diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/menu/main.xml b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/menu/main.xml
deleted file mode 100644
index f3b10b6c..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/menu/main.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/action_settings"
- android:title="@string/action_settings"
- android:orderInCategory="100"
- android:showAsAction="never" />
-</menu>
diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/menu/main_activity2.xml b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/menu/main_activity2.xml
deleted file mode 100644
index f3b10b6c..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/menu/main_activity2.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/action_settings"
- android:title="@string/action_settings"
- android:orderInCategory="100"
- android:showAsAction="never" />
-</menu>
diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/dimens.xml b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/dimens.xml
deleted file mode 100644
index 47c82246..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources>
- <!-- Default screen margins, per the Android Design guidelines. -->
- <dimen name="activity_horizontal_margin">16dp</dimen>
- <dimen name="activity_vertical_margin">16dp</dimen>
-</resources>
diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/strings.xml b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/strings.xml
deleted file mode 100644
index d8f08bc2..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <string name="app_name">AndroidSample</string>
- <string name="action_settings">Settings</string>
- <string name="hello_world">Hello world!</string>
- <string name="title_activity_main_activity1">JavaActivity</string>
- <string name="title_activity_main_activity2">KotlinActivity</string>
-
-</resources>
diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/styles.xml b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/styles.xml
deleted file mode 100644
index 6ce89c7b..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<resources>
-
- <!--
- Base application theme, dependent on API level. This theme is replaced
- by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
- -->
- <style name="AppBaseTheme" parent="android:Theme.Light">
- <!--
- Theme customizations available in newer API levels can go in
- res/values-vXX/styles.xml, while customizations related to
- backward-compatibility can go here.
- -->
- </style>
-
- <!-- Application theme. -->
- <style name="AppTheme" parent="AppBaseTheme">
- <!-- All customizations that are NOT specific to a particular API-level can go here. -->
- </style>
-
-</resources>
diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/build.gradle b/integration-tests/gradle-integration-tests/testData/androidApp/build.gradle
deleted file mode 100644
index 35356b90..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidApp/build.gradle
+++ /dev/null
@@ -1,21 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- jcenter()
- maven { url 'https://maven.google.com' }
- maven { url "https://dl.bintray.com/kotlin/kotlin-eap-1.1" }
- maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
- }
- dependencies {
- classpath "com.android.tools.build:gradle:$abt_plugin_version"
- }
-}
-
-allprojects {
- repositories {
- mavenCentral()
- jcenter()
- maven { url "https://dl.bintray.com/kotlin/kotlin-eap-1.1" }
- maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
- }
-}
diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/fileTree.txt b/integration-tests/gradle-integration-tests/testData/androidApp/fileTree.txt
deleted file mode 100644
index f66c79e3..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidApp/fileTree.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-/
- app/
- alltypes/
- index.html
- index-outline.html
- index.html
- org.example.kotlin.mixed/
- -java-activity/
- -init-.html
- index.html
- on-create-options-menu.html
- on-create.html
- -kotlin-activity/
- -init-.html
- index.html
- on-create-options-menu.html
- on-create.html
- index.html
- package-list
- style.css
diff --git a/integration-tests/gradle-integration-tests/testData/androidApp/settings.gradle b/integration-tests/gradle-integration-tests/testData/androidApp/settings.gradle
deleted file mode 100644
index 1feb2867..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidApp/settings.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-rootProject.name = "androidApp"
-
-include ':app' \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle
deleted file mode 100644
index 66421f52..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle
+++ /dev/null
@@ -1,49 +0,0 @@
-buildscript {
- repositories {
- jcenter()
- mavenLocal()
- }
- dependencies {
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$test_kotlin_version"
- }
-}
-
-plugins {
- id 'org.jetbrains.dokka'
-}
-
-
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-
-android {
- compileSdkVersion Integer.parseInt(sdk_version)
- buildToolsVersion abt_version
-
- defaultConfig {
- applicationId "org.example.kotlin.mixed"
- minSdkVersion 14
- targetSdkVersion Integer.parseInt(sdk_version)
- versionCode 1
- versionName "1.0"
- }
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt')
- }
- }
- sourceSets {
- main.java.srcDirs += 'src/main/kotlin'
- }
-}
-
-dependencies {
- compile "org.jetbrains.kotlin:kotlin-stdlib:$test_kotlin_version"
- dokkaRuntime files(dokka_fatjar)
-}
-
-
-dokka {
- outputFormat = "javadoc"
-} \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/AndroidManifest.xml b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/AndroidManifest.xml
deleted file mode 100644
index b4e1a892..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.example.kotlin.mixed" >
-
- <application
- android:allowBackup="true"
- android:icon="@drawable/ic_launcher"
- android:label="@string/app_name"
- android:theme="@style/AppTheme" >
-
- <activity
- android:name=".JavaActivity"
- android:label="@string/title_activity_main_activity1" >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
-
- <activity
- android:name=".KotlinActivity"
- android:label="@string/title_activity_main_activity2" />
-
- </application>
-
-</manifest>
diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java
deleted file mode 100644
index 3668c594..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.example.kotlin.mixed;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.app.Activity;
-import android.view.Menu;
-import android.view.View;
-import android.widget.Button;
-
-public class JavaActivity extends Activity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
-
- Button next = (Button) findViewById(R.id.Button01);
- next.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- Intent myIntent = new Intent(view.getContext(), KotlinActivity.class);
- startActivityForResult(myIntent, 0);
- }
- });
- }
-
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate the menu; this adds items to the action bar if it is present.
- getMenuInflater().inflate(R.menu.main, menu);
- return true;
- }
-
-}
diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt
deleted file mode 100644
index ca2f27b0..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.example.kotlin.mixed
-
-import android.content.Intent
-import android.os.Bundle
-import android.app.Activity
-import android.view.Menu
-import android.widget.Button
-
-class KotlinActivity : Activity() {
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- setContentView(R.layout.activity_main2)
-
- val next = findViewById(R.id.Button02) as Button
- next.setOnClickListener {
- val intent: Intent = Intent()
- setResult(RESULT_OK, intent)
- finish()
- }
- }
-
- override fun onCreateOptionsMenu(menu: Menu?): Boolean {
- // Inflate the menu; this adds items to the action bar if it is present.
- menuInflater.inflate(R.menu.main_activity2, menu)
- return true
- }
-}
diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-hdpi/ic_launcher.png b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 96a442e5..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-mdpi/ic_launcher.png b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 359047df..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-xhdpi/ic_launcher.png b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 71c6d760..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/layout/activity_main.xml b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index ede57c39..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin"
- android:paddingBottom="@dimen/activity_vertical_margin"
- tools:context=".MainActivity">
-
- <TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="Activity 1" />
-
- <Button android:text="Next"
- android:id="@+id/Button01"
- android:layout_width="250px"
- android:textSize="18px"
- android:layout_height="55px">
- </Button>
-
-</LinearLayout>
diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/layout/activity_main2.xml b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/layout/activity_main2.xml
deleted file mode 100644
index d707536a..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/layout/activity_main2.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin"
- android:paddingBottom="@dimen/activity_vertical_margin"
- tools:context=".MainActivity">
-
- <TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="Activity 2" />
-
- <Button android:text="Next"
- android:id="@+id/Button02"
- android:layout_width="250px"
- android:textSize="18px"
- android:layout_height="55px">
- </Button>
-
-</LinearLayout>
diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/menu/main.xml b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/menu/main.xml
deleted file mode 100644
index f3b10b6c..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/menu/main.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/action_settings"
- android:title="@string/action_settings"
- android:orderInCategory="100"
- android:showAsAction="never" />
-</menu>
diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/menu/main_activity2.xml b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/menu/main_activity2.xml
deleted file mode 100644
index f3b10b6c..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/menu/main_activity2.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/action_settings"
- android:title="@string/action_settings"
- android:orderInCategory="100"
- android:showAsAction="never" />
-</menu>
diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/dimens.xml b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/dimens.xml
deleted file mode 100644
index 47c82246..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources>
- <!-- Default screen margins, per the Android Design guidelines. -->
- <dimen name="activity_horizontal_margin">16dp</dimen>
- <dimen name="activity_vertical_margin">16dp</dimen>
-</resources>
diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/strings.xml b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/strings.xml
deleted file mode 100644
index d8f08bc2..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <string name="app_name">AndroidSample</string>
- <string name="action_settings">Settings</string>
- <string name="hello_world">Hello world!</string>
- <string name="title_activity_main_activity1">JavaActivity</string>
- <string name="title_activity_main_activity2">KotlinActivity</string>
-
-</resources>
diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/styles.xml b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/styles.xml
deleted file mode 100644
index 6ce89c7b..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<resources>
-
- <!--
- Base application theme, dependent on API level. This theme is replaced
- by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
- -->
- <style name="AppBaseTheme" parent="android:Theme.Light">
- <!--
- Theme customizations available in newer API levels can go in
- res/values-vXX/styles.xml, while customizations related to
- backward-compatibility can go here.
- -->
- </style>
-
- <!-- Application theme. -->
- <style name="AppTheme" parent="AppBaseTheme">
- <!-- All customizations that are NOT specific to a particular API-level can go here. -->
- </style>
-
-</resources>
diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/build.gradle b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/build.gradle
deleted file mode 100644
index 35356b90..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/build.gradle
+++ /dev/null
@@ -1,21 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- jcenter()
- maven { url 'https://maven.google.com' }
- maven { url "https://dl.bintray.com/kotlin/kotlin-eap-1.1" }
- maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
- }
- dependencies {
- classpath "com.android.tools.build:gradle:$abt_plugin_version"
- }
-}
-
-allprojects {
- repositories {
- mavenCentral()
- jcenter()
- maven { url "https://dl.bintray.com/kotlin/kotlin-eap-1.1" }
- maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
- }
-}
diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/fileTree.txt b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/fileTree.txt
deleted file mode 100644
index c5e79eba..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/fileTree.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-/
- allclasses-frame.html
- allclasses-noframe.html
- constant-values.html
- deprecated-list.html
- help-doc.html
- index-all.html
- index.html
- org/
- example/
- kotlin/
- mixed/
- JavaActivity.html
- KotlinActivity.html
- package-frame.html
- package-summary.html
- package-tree.html
- overview-tree.html
- package-list
- script.js
- stylesheet.css
diff --git a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/settings.gradle b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/settings.gradle
deleted file mode 100644
index a4e67fea..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/settings.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-rootProject.name = "androidAppJavadoc"
-
-include ':app' \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/build.gradle b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/build.gradle
deleted file mode 100644
index 736668ab..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/build.gradle
+++ /dev/null
@@ -1,20 +0,0 @@
-subprojects {
- buildscript {
- repositories {
- mavenCentral()
- jcenter()
- maven { url 'https://maven.google.com' }
- maven { url "https://dl.bintray.com/kotlin/kotlin-eap/" }
- maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
- }
-
- }
-
- repositories {
- mavenCentral()
- jcenter()
- maven { url 'https://maven.google.com' }
- maven { url "https://dl.bintray.com/kotlin/kotlin-eap/" }
- maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
- }
-} \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/fileTree.txt b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/fileTree.txt
deleted file mode 100644
index 6c96a01c..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/fileTree.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-/
- lib/
- alltypes/
- index.html
- example/
- -lib-clz-use/
- -init-.html
- f.html
- index.html
- index.html
- index-outline.html
- index.html
- package-list
- style.css
diff --git a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/jlib/build.gradle b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/jlib/build.gradle
deleted file mode 100644
index bbfeb03c..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/jlib/build.gradle
+++ /dev/null
@@ -1 +0,0 @@
-apply plugin: 'java'
diff --git a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/jlib/src/main/java/example/jlib/LibClz.java b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/jlib/src/main/java/example/jlib/LibClz.java
deleted file mode 100644
index 1d9a6fb2..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/jlib/src/main/java/example/jlib/LibClz.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package example.jlib;
-
-public class LibClz {
-
-} \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle
deleted file mode 100644
index b1ee52ab..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle
+++ /dev/null
@@ -1,39 +0,0 @@
-buildscript {
- dependencies {
- classpath "com.android.tools.build:gradle:$abt_plugin_version"
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$test_kotlin_version"
- }
-}
-
-
-plugins {
- id 'org.jetbrains.dokka'
-}
-
-
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-
-
-android {
- compileSdkVersion Integer.parseInt(sdk_version)
- buildToolsVersion abt_version
-
- sourceSets {
- main.java.srcDirs += 'src/main/kotlin'
- }
-}
-
-dependencies {
- api(project(":jlib"))
- dokkaRuntime files(dokka_fatjar)
-}
-
-dokka {
- configuration {
- externalDocumentationLink {
- url = new URL("https://example.com")
- packageListUrl = file("$rootDir/package-list").toURI().toURL()
- }
- }
-} \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/AndroidManifest.xml b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/AndroidManifest.xml
deleted file mode 100644
index 267f6efd..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="example">
-</manifest>
diff --git a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/kotlin/example/LibClzUse.kt b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/kotlin/example/LibClzUse.kt
deleted file mode 100644
index d034a3a9..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/kotlin/example/LibClzUse.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package example
-
-import example.jlib.LibClz
-
-/**
- * Uses jlib
- */
-class LibClzUse {
- /**
- * Returns LibClz
- */
- fun f(): LibClz = LibClz()
-} \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/package-list b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/package-list
deleted file mode 100644
index bf76058e..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/package-list
+++ /dev/null
@@ -1 +0,0 @@
-example.jlib \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/settings.gradle b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/settings.gradle
deleted file mode 100644
index 5b4250a0..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/settings.gradle
+++ /dev/null
@@ -1,5 +0,0 @@
-rootProject.name = "androidLibDependsOnJavaLib"
-
-
-include(":lib")
-include(":jlib") \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle
deleted file mode 100644
index 660257ab..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle
+++ /dev/null
@@ -1,75 +0,0 @@
-buildscript {
- repositories {
- jcenter()
- mavenLocal()
- }
- dependencies {
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$test_kotlin_version"
- }
-}
-
-plugins {
- id 'org.jetbrains.dokka'
-}
-
-
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-
-android {
- compileSdkVersion Integer.parseInt(sdk_version)
- buildToolsVersion abt_version
-
- defaultConfig {
- applicationId "org.example.kotlin.mixed"
- minSdkVersion 14
- targetSdkVersion Integer.parseInt(sdk_version)
- versionCode 1
- versionName "1.0"
- }
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt')
- }
- }
-
- flavorDimensions "mode"
- productFlavors {
- free {
- dimension "mode"
- applicationIdSuffix ".free"
- versionNameSuffix "-free"
- }
- full {
- dimension "mode"
- applicationIdSuffix ".full"
- versionNameSuffix "-full"
- }
- }
- sourceSets {
- main.java.srcDirs += 'src/main/kotlin'
- free.java.srcDirs += 'src/free/kotlin'
- }
-}
-
-dependencies {
- compile "org.jetbrains.kotlin:kotlin-stdlib:$test_kotlin_version"
- dokkaRuntime files(dokka_fatjar)
-}
-
-
-dokka {
- outputDirectory = "$buildDir/dokka/all"
-}
-
-task dokkaFullFlavourOnly(type: org.jetbrains.dokka.gradle.DokkaTask) {
- outputDirectory = "$buildDir/dokka/fullOnly"
- configuration {
- moduleName = "full"
- kotlinTasks {
- ["compileFullReleaseKotlin"]
- }
- }
-} \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/AndroidManifest.xml b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/AndroidManifest.xml
deleted file mode 100644
index 3ecbcd3a..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/AndroidManifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
- <application>
- <activity
- android:name="org.example.kotlin.mixed.free.AdActivity"
- android:label="@string/title_activity_ad"
- android:theme="@style/AppTheme"></activity>
- </application>
-</manifest>
diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/kotlin/org/example/kotlin/mixed/free/AdActivity.kt b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/kotlin/org/example/kotlin/mixed/free/AdActivity.kt
deleted file mode 100644
index b0b980fd..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/kotlin/org/example/kotlin/mixed/free/AdActivity.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.example.kotlin.mixed.free
-
-import android.os.Bundle
-import android.app.Activity
-import org.example.kotlin.mixed.R
-
-class AdActivity : Activity() {
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- setContentView(R.layout.activity_ad)
- }
-
-}
diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/res/layout/activity_ad.xml b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/res/layout/activity_ad.xml
deleted file mode 100644
index e6443d05..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/res/layout/activity_ad.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin"
- android:paddingBottom="@dimen/activity_vertical_margin"
- tools:context=".free.AdActivity">
-
- <TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="Advertisment" />
-
- <Button android:text="Next"
- android:id="@+id/Button02"
- android:layout_width="250px"
- android:textSize="18px"
- android:layout_height="55px">
- </Button>
-
-</LinearLayout>
diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/res/values/strings.xml b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/res/values/strings.xml
deleted file mode 100644
index bbdf2d06..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
- <string name="title_activity_ad">AdActivity</string>
-</resources>
diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/AndroidManifest.xml b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/AndroidManifest.xml
deleted file mode 100644
index b4e1a892..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.example.kotlin.mixed" >
-
- <application
- android:allowBackup="true"
- android:icon="@drawable/ic_launcher"
- android:label="@string/app_name"
- android:theme="@style/AppTheme" >
-
- <activity
- android:name=".JavaActivity"
- android:label="@string/title_activity_main_activity1" >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
-
- <activity
- android:name=".KotlinActivity"
- android:label="@string/title_activity_main_activity2" />
-
- </application>
-
-</manifest>
diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java
deleted file mode 100644
index 3668c594..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/java/org/example/kotlin/mixed/JavaActivity.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.example.kotlin.mixed;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.app.Activity;
-import android.view.Menu;
-import android.view.View;
-import android.widget.Button;
-
-public class JavaActivity extends Activity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
-
- Button next = (Button) findViewById(R.id.Button01);
- next.setOnClickListener(new View.OnClickListener() {
- public void onClick(View view) {
- Intent myIntent = new Intent(view.getContext(), KotlinActivity.class);
- startActivityForResult(myIntent, 0);
- }
- });
- }
-
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- // Inflate the menu; this adds items to the action bar if it is present.
- getMenuInflater().inflate(R.menu.main, menu);
- return true;
- }
-
-}
diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt
deleted file mode 100644
index ca2f27b0..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/kotlin/org/example/kotlin/mixed/KotlinActivity.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.example.kotlin.mixed
-
-import android.content.Intent
-import android.os.Bundle
-import android.app.Activity
-import android.view.Menu
-import android.widget.Button
-
-class KotlinActivity : Activity() {
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- setContentView(R.layout.activity_main2)
-
- val next = findViewById(R.id.Button02) as Button
- next.setOnClickListener {
- val intent: Intent = Intent()
- setResult(RESULT_OK, intent)
- finish()
- }
- }
-
- override fun onCreateOptionsMenu(menu: Menu?): Boolean {
- // Inflate the menu; this adds items to the action bar if it is present.
- menuInflater.inflate(R.menu.main_activity2, menu)
- return true
- }
-}
diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-hdpi/ic_launcher.png b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 96a442e5..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-mdpi/ic_launcher.png b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 359047df..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-xhdpi/ic_launcher.png b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 71c6d760..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/drawable-xhdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/layout/activity_main.xml b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index ede57c39..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin"
- android:paddingBottom="@dimen/activity_vertical_margin"
- tools:context=".MainActivity">
-
- <TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="Activity 1" />
-
- <Button android:text="Next"
- android:id="@+id/Button01"
- android:layout_width="250px"
- android:textSize="18px"
- android:layout_height="55px">
- </Button>
-
-</LinearLayout>
diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/layout/activity_main2.xml b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/layout/activity_main2.xml
deleted file mode 100644
index d707536a..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/layout/activity_main2.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:orientation="vertical"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin"
- android:paddingBottom="@dimen/activity_vertical_margin"
- tools:context=".MainActivity">
-
- <TextView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="Activity 2" />
-
- <Button android:text="Next"
- android:id="@+id/Button02"
- android:layout_width="250px"
- android:textSize="18px"
- android:layout_height="55px">
- </Button>
-
-</LinearLayout>
diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/menu/main.xml b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/menu/main.xml
deleted file mode 100644
index f3b10b6c..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/menu/main.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/action_settings"
- android:title="@string/action_settings"
- android:orderInCategory="100"
- android:showAsAction="never" />
-</menu>
diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/menu/main_activity2.xml b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/menu/main_activity2.xml
deleted file mode 100644
index f3b10b6c..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/menu/main_activity2.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/action_settings"
- android:title="@string/action_settings"
- android:orderInCategory="100"
- android:showAsAction="never" />
-</menu>
diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/values/dimens.xml b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/values/dimens.xml
deleted file mode 100644
index 47c82246..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources>
- <!-- Default screen margins, per the Android Design guidelines. -->
- <dimen name="activity_horizontal_margin">16dp</dimen>
- <dimen name="activity_vertical_margin">16dp</dimen>
-</resources>
diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/values/strings.xml b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/values/strings.xml
deleted file mode 100644
index d8f08bc2..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <string name="app_name">AndroidSample</string>
- <string name="action_settings">Settings</string>
- <string name="hello_world">Hello world!</string>
- <string name="title_activity_main_activity1">JavaActivity</string>
- <string name="title_activity_main_activity2">KotlinActivity</string>
-
-</resources>
diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/values/styles.xml b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/values/styles.xml
deleted file mode 100644
index 6ce89c7b..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<resources>
-
- <!--
- Base application theme, dependent on API level. This theme is replaced
- by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
- -->
- <style name="AppBaseTheme" parent="android:Theme.Light">
- <!--
- Theme customizations available in newer API levels can go in
- res/values-vXX/styles.xml, while customizations related to
- backward-compatibility can go here.
- -->
- </style>
-
- <!-- Application theme. -->
- <style name="AppTheme" parent="AppBaseTheme">
- <!-- All customizations that are NOT specific to a particular API-level can go here. -->
- </style>
-
-</resources>
diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/build.gradle b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/build.gradle
deleted file mode 100644
index 35356b90..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/build.gradle
+++ /dev/null
@@ -1,21 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- jcenter()
- maven { url 'https://maven.google.com' }
- maven { url "https://dl.bintray.com/kotlin/kotlin-eap-1.1" }
- maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
- }
- dependencies {
- classpath "com.android.tools.build:gradle:$abt_plugin_version"
- }
-}
-
-allprojects {
- repositories {
- mavenCentral()
- jcenter()
- maven { url "https://dl.bintray.com/kotlin/kotlin-eap-1.1" }
- maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
- }
-}
diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/fileTree.txt b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/fileTree.txt
deleted file mode 100644
index 77b563b2..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/fileTree.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-/
- all/
- app/
- alltypes/
- index.html
- index-outline.html
- index.html
- org.example.kotlin.mixed/
- -java-activity/
- -init-.html
- index.html
- on-create-options-menu.html
- on-create.html
- -kotlin-activity/
- -init-.html
- index.html
- on-create-options-menu.html
- on-create.html
- index.html
- org.example.kotlin.mixed.free/
- -ad-activity/
- -init-.html
- index.html
- on-create.html
- index.html
- package-list
- style.css
- fullOnly/
- full/
- alltypes/
- index.html
- index-outline.html
- index.html
- org.example.kotlin.mixed/
- -java-activity/
- -init-.html
- index.html
- on-create-options-menu.html
- on-create.html
- -kotlin-activity/
- -init-.html
- index.html
- on-create-options-menu.html
- on-create.html
- index.html
- package-list
- style.css
diff --git a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/settings.gradle b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/settings.gradle
deleted file mode 100644
index 1feb2867..00000000
--- a/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/settings.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-rootProject.name = "androidApp"
-
-include ':app' \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/testData/basic/build.gradle b/integration-tests/gradle-integration-tests/testData/basic/build.gradle
deleted file mode 100644
index 18c617b7..00000000
--- a/integration-tests/gradle-integration-tests/testData/basic/build.gradle
+++ /dev/null
@@ -1,46 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- jcenter()
- mavenLocal()
- maven { url "https://dl.bintray.com/kotlin/kotlin-eap" }
- maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
- }
- dependencies {
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$test_kotlin_version"
- }
-}
-
-plugins {
- id 'org.jetbrains.dokka'
-}
-
-apply plugin: 'kotlin'
-apply plugin: 'org.jetbrains.dokka'
-
-repositories {
- mavenCentral()
- jcenter()
- maven {
- url "https://dl.bintray.com/kotlin/kotlin-eap"
- }
- maven {
- url "https://dl.bintray.com/kotlin/kotlin-dev"
- }
-}
-
-dependencies {
- dokkaRuntime files(dokka_fatjar)
- compile group: 'org.jetbrains.kotlin', name: 'kotlin-runtime', version: test_kotlin_version
- compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: test_kotlin_version
-}
-
-
-/*
-dokka {
- configuration {
- classpath += "$projectDir/classDir"
- }
-}
-
- */
diff --git a/integration-tests/gradle-integration-tests/testData/basic/classDir/p1/MyBinaryClass.class b/integration-tests/gradle-integration-tests/testData/basic/classDir/p1/MyBinaryClass.class
deleted file mode 100644
index ccfff300..00000000
--- a/integration-tests/gradle-integration-tests/testData/basic/classDir/p1/MyBinaryClass.class
+++ /dev/null
Binary files differ
diff --git a/integration-tests/gradle-integration-tests/testData/basic/fileTree.txt b/integration-tests/gradle-integration-tests/testData/basic/fileTree.txt
deleted file mode 100644
index 2ceae371..00000000
--- a/integration-tests/gradle-integration-tests/testData/basic/fileTree.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-/
- basic/
- alltypes/
- index.html
- demo/
- -a/
- -init-.html
- index.html
- p.html
- -greeter/
- -init-.html
- greet.html
- index.html
- name.html
- -some-interface.html
- -some-sub-type/
- -init-.html
- index.html
- -some-type/
- -init-.html
- index.html
- constructor.html
- index.html
- main.html
- p1.-my-binary-class/
- index.html
- test.html
- str.html
- x.html
- index-outline.html
- index.html
- package-list
- style.css
diff --git a/integration-tests/gradle-integration-tests/testData/basic/settings.gradle b/integration-tests/gradle-integration-tests/testData/basic/settings.gradle
deleted file mode 100644
index a0498790..00000000
--- a/integration-tests/gradle-integration-tests/testData/basic/settings.gradle
+++ /dev/null
@@ -1,11 +0,0 @@
-pluginManagement {
- repositories {
- maven { url 'https://dl.bintray.com/kotlin/kotlin-dev/' }
- mavenLocal()
- mavenCentral()
- jcenter()
- gradlePluginPortal()
- }
-}
-
-rootProject.name = "basic"
diff --git a/integration-tests/gradle-integration-tests/testData/basic/src/main/kotlin/demo/HelloWorld.kt b/integration-tests/gradle-integration-tests/testData/basic/src/main/kotlin/demo/HelloWorld.kt
deleted file mode 100644
index 3d7bcb51..00000000
--- a/integration-tests/gradle-integration-tests/testData/basic/src/main/kotlin/demo/HelloWorld.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package demo
-
-import p1.MyBinaryClass
-
-/**
- * This class supports greeting people by name.
- *
- * @property name The name of the person to be greeted.
- */
-class Greeter(val name: String) {
-
- /**
- * Prints the greeting to the standard output.
- */
- fun greet() {
- println("Hello $name!")
- }
-}
-
-fun main(args: Array<String>) {
- Greeter(args[0]).greet()
-}
-
-val str = "Hello! ".repeat(4)
-val x: (a: String, b: Int) -> Int = { a, b -> 0 }
-
-interface SomeInterface
-private class SomeImpl : SomeInterface
-
-fun SomeInterface.constructor(): SomeInterface {
- return SomeImpl()
-}
-
-open class SomeType
-class SomeSubType : SomeType()
-
-fun SomeType.constructor(): SomeType {
- return SomeSubType()
-}
-
-
-annotation class A(val p: String)
-
-val MyBinaryClass.test get() = s()
-
diff --git a/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/build.gradle b/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/build.gradle
deleted file mode 100644
index 0ea86d4c..00000000
--- a/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/build.gradle
+++ /dev/null
@@ -1,37 +0,0 @@
-plugins {
- id 'org.jetbrains.dokka'
-}
-
-subprojects {
- buildscript {
- repositories {
- mavenCentral()
- jcenter()
- maven { url "https://dl.bintray.com/kotlin/kotlin-eap-1.1" }
- maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
- }
- dependencies {
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$test_kotlin_version"
- }
- }
- repositories {
- mavenCentral()
- jcenter()
- maven { url "https://dl.bintray.com/kotlin/kotlin-eap-1.1" }
- maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
- }
-}
-
-dependencies {
- dokkaRuntime files(dokka_fatjar)
-}
-
-apply plugin: 'org.jetbrains.dokka'
-
-dokka {
- configuration {
- kotlinTasks {
- [":subA:compileKotlin", ":subB:compileKotlin"]
- }
- }
-} \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/fileTree.txt b/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/fileTree.txt
deleted file mode 100644
index 5624fca6..00000000
--- a/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/fileTree.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-/
- multi-project-root/
- alltypes/
- index.html
- index-outline.html
- index.html
- package-list
- s1/
- -my-class/
- -init-.html
- index.html
- otherworks.html
- -super/
- -init-.html
- bar.html
- foo.html
- index.html
- index.html
- some-cool-thing.html
- s2/
- -cooler/
- -init-.html
- a.html
- coolest.html
- index.html
- my-class.html
- -superful/
- -init-.html
- bar.html
- index.html
- index.html
- main.html
- style.css
diff --git a/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/settings.gradle b/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/settings.gradle
deleted file mode 100644
index 283cc526..00000000
--- a/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/settings.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-rootProject.name = "multiProjectRoot"
-
-include 'subA', 'subB' \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subA/build.gradle b/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subA/build.gradle
deleted file mode 100644
index 0600411e..00000000
--- a/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subA/build.gradle
+++ /dev/null
@@ -1,6 +0,0 @@
-apply plugin: 'kotlin'
-
-dependencies {
- compile group: 'org.jetbrains.kotlin', name: 'kotlin-runtime', version: test_kotlin_version
- compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: test_kotlin_version
-}
diff --git a/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subA/src/main/kotlin/module.kt b/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subA/src/main/kotlin/module.kt
deleted file mode 100644
index 126d7f3e..00000000
--- a/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subA/src/main/kotlin/module.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package s1
-
-/**
- * Coolest one
- */
-fun someCoolThing(s: String) = s.repeat(2)
-
-/**
- * Just a class
- */
-class MyClass {
- /**
- * Ultimate answer to all questions
- */
- fun otherworks(): Int = 42
-}
-
-/**
- * Just a SUPER class
- */
-open class Super {
- /**
- * Same as [MyClass.otherworks]
- */
- fun foo(i: Int = 21) = i * 2
-
- /**
- * magic
- */
- open fun bar() = foo()
-} \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subB/build.gradle b/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subB/build.gradle
deleted file mode 100644
index 7b8ff9f3..00000000
--- a/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subB/build.gradle
+++ /dev/null
@@ -1,7 +0,0 @@
-apply plugin: 'kotlin'
-
-dependencies {
- compile group: 'org.jetbrains.kotlin', name: 'kotlin-runtime', version: test_kotlin_version
- compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: test_kotlin_version
- compile project(":subA")
-}
diff --git a/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subB/src/main/kotlin/module.kt b/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subB/src/main/kotlin/module.kt
deleted file mode 100644
index 8a87590a..00000000
--- a/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subB/src/main/kotlin/module.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package s2
-
-import s1.Super
-import s1.MyClass
-import s1.someCoolThing
-
-/**
- * Just an entry-point
- */
-fun main(args: Array<String>) {
-
-}
-
-/**
- * Take a glass of hot water
- */
-class Cooler {
- val myClass = MyClass()
- val a = myClass.otherworks()
- val coolest = someCoolThing()
-}
-
-/**
- * Powerful
- */
-class Superful : Super() {
- /**
- * Overriden magic
- */
- override fun bar() = foo(20) * 2
-} \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/testData/multiplatformProject/build.gradle b/integration-tests/gradle-integration-tests/testData/multiplatformProject/build.gradle
deleted file mode 100644
index b5454c55..00000000
--- a/integration-tests/gradle-integration-tests/testData/multiplatformProject/build.gradle
+++ /dev/null
@@ -1,60 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- jcenter()
- maven { url "https://dl.bintray.com/kotlin/kotlin-eap-1.1" }
- maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
- }
- dependencies {
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$test_kotlin_version"
- }
-}
-
-plugins {
- id 'org.jetbrains.dokka'
-}
-
-repositories {
- jcenter()
- mavenLocal()
-}
-
-group 'org.test'
-version '1.0-SNAPSHOT'
-
-apply plugin: "org.jetbrains.kotlin.multiplatform"
-
-kotlin {
- jvm() // Create a JVM target with the default name 'jvm'
- js()
- sourceSets {
- jsMain {
- dependencies{
- implementation "org.jetbrains.kotlin:kotlin-stdlib-js"
- }
- }
- jvmMain {
- dependencies {
- implementation kotlin('stdlib-jdk8')
- }
- }
- }
-}
-
-dependencies {
- dokkaRuntime files(dokka_fatjar)
-}
-
-apply plugin: 'org.jetbrains.dokka'
-
-dokka {
-
- multiplatform {
- javascript {
- targets = ["js"]
- platform = "js"
- kotlinTasks { [tasks.getByPath(":compileKotlinJs")] }
- }
- jvm {}
- }
-}
diff --git a/integration-tests/gradle-integration-tests/testData/multiplatformProject/fileTree.txt b/integration-tests/gradle-integration-tests/testData/multiplatformProject/fileTree.txt
deleted file mode 100644
index e9cc847c..00000000
--- a/integration-tests/gradle-integration-tests/testData/multiplatformProject/fileTree.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-/
- multiplatform-project-root/
- alltypes/
- index.html
- index-outline.html
- index.html
- org.kotlintestmpp/
- get-current-date.html
- index.html
- js.html
- jvm.html
- kotlin.-string/
- index.html
- my-extension.html
- main.html
- shared.html
- package-list
- style.css
diff --git a/integration-tests/gradle-integration-tests/testData/multiplatformProject/settings.gradle b/integration-tests/gradle-integration-tests/testData/multiplatformProject/settings.gradle
deleted file mode 100644
index 0bb1e91b..00000000
--- a/integration-tests/gradle-integration-tests/testData/multiplatformProject/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = "multiplatformProjectRoot"
diff --git a/integration-tests/gradle-integration-tests/testData/multiplatformProject/src/jsMain/kotlin/org/kotlintestmpp/main.kt b/integration-tests/gradle-integration-tests/testData/multiplatformProject/src/jsMain/kotlin/org/kotlintestmpp/main.kt
deleted file mode 100644
index a77b50f9..00000000
--- a/integration-tests/gradle-integration-tests/testData/multiplatformProject/src/jsMain/kotlin/org/kotlintestmpp/main.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.kotlintestmpp
-
-fun main(args : Array<String>) {
- console.log("Hello, world!")
-}
-
-fun js(){}
-fun shared(){}
-
-fun getCurrentDate(): String {
- return "test"
-}
-
-fun String.myExtension() = println("test") \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/testData/multiplatformProject/src/jvmMain/kotlin/org/kotlintestmpp/main.kt b/integration-tests/gradle-integration-tests/testData/multiplatformProject/src/jvmMain/kotlin/org/kotlintestmpp/main.kt
deleted file mode 100644
index 96d725fc..00000000
--- a/integration-tests/gradle-integration-tests/testData/multiplatformProject/src/jvmMain/kotlin/org/kotlintestmpp/main.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.kotlintestmpp
-
-
-fun main(args : Array<String>) {
- println("Hello, world!")
-}
-
-/**
- * comment for this class
- */
-fun jvm(){}
-fun shared(){}
-
-fun getCurrentDate(): String {
- return "test"
-}
-
-fun String.myExtension() = println("test2")
-
-
diff --git a/integration-tests/gradle-integration-tests/testData/sourcesChange/build.gradle b/integration-tests/gradle-integration-tests/testData/sourcesChange/build.gradle
deleted file mode 100644
index a6270e23..00000000
--- a/integration-tests/gradle-integration-tests/testData/sourcesChange/build.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-buildscript {
- repositories {
- mavenCentral()
- jcenter()
- maven { url "https://dl.bintray.com/kotlin/kotlin-eap-1.1" }
- maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
- }
- dependencies {
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$test_kotlin_version"
- }
-}
-
-plugins {
- id 'org.jetbrains.dokka'
-}
-
-apply plugin: 'kotlin'
-apply plugin: 'org.jetbrains.dokka'
-
-repositories {
- mavenCentral()
- jcenter()
- maven {
- url "https://dl.bintray.com/kotlin/kotlin-eap-1.1"
- }
- maven {
- url "https://dl.bintray.com/kotlin/kotlin-dev"
- }
-}
-
-dependencies {
- dokkaRuntime files(dokka_fatjar)
- compile group: 'org.jetbrains.kotlin', name: 'kotlin-runtime', version: test_kotlin_version
- compile group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: test_kotlin_version
-} \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/testData/sourcesChange/fileTree.txt b/integration-tests/gradle-integration-tests/testData/sourcesChange/fileTree.txt
deleted file mode 100644
index 09f3724b..00000000
--- a/integration-tests/gradle-integration-tests/testData/sourcesChange/fileTree.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-/
- sources-change/
- alltypes.html
- demo/
- hello.html
- index.html
- index-outline.html
- index.html
- package-list
- style.css
diff --git a/integration-tests/gradle-integration-tests/testData/sourcesChange/fileTree1.txt b/integration-tests/gradle-integration-tests/testData/sourcesChange/fileTree1.txt
deleted file mode 100644
index eeb377f7..00000000
--- a/integration-tests/gradle-integration-tests/testData/sourcesChange/fileTree1.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-/
- sources-change/
- alltypes.html
- demo/
- hello.html
- index.html
- world.html
- index-outline.html
- index.html
- package-list
- style.css
diff --git a/integration-tests/gradle-integration-tests/testData/sourcesChange/settings.gradle b/integration-tests/gradle-integration-tests/testData/sourcesChange/settings.gradle
deleted file mode 100644
index 3fb032bf..00000000
--- a/integration-tests/gradle-integration-tests/testData/sourcesChange/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = "sourcesChange" \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/testData/sourcesChange/src/main/kotlin/demo/HelloWorld.kt b/integration-tests/gradle-integration-tests/testData/sourcesChange/src/main/kotlin/demo/HelloWorld.kt
deleted file mode 100644
index c54dea50..00000000
--- a/integration-tests/gradle-integration-tests/testData/sourcesChange/src/main/kotlin/demo/HelloWorld.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package demo
-
-/**
- * @return Hello
- */
-fun hello(): String = "Hello" \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/testData/sourcesChange/src1/main/kotlin/demo/HelloWorld.kt b/integration-tests/gradle-integration-tests/testData/sourcesChange/src1/main/kotlin/demo/HelloWorld.kt
deleted file mode 100644
index 53f22ff5..00000000
--- a/integration-tests/gradle-integration-tests/testData/sourcesChange/src1/main/kotlin/demo/HelloWorld.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package demo
-
-/**
- * @return Hello
- */
-fun hello(): String = "Hello"
-
-/**
- * @return World
- */
-fun world(): String = "World" \ No newline at end of file
diff --git a/integration-tests/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle b/integration-tests/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle
deleted file mode 100644
index 8688ae41..00000000
--- a/integration-tests/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle
+++ /dev/null
@@ -1,73 +0,0 @@
-import org.jetbrains.dokka.*
-import org.jetbrains.dokka.gradle.*
-import org.jetbrains.kotlin.gradle.tasks.*
-
-import groovy.transform.CompileStatic
-import java.util.concurrent.Callable
-
-buildscript {
- repositories {
- jcenter()
- mavenLocal()
- }
- dependencies {
- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$test_kotlin_version"
- }
-}
-
-plugins {
- id 'org.jetbrains.dokka'
-}
-
-apply plugin: 'kotlin'
-
-@CompileStatic
-def configureDokkaTypeSafely(DokkaTask dokka) {
- dokka.with {
- outputFormat = "some String"
- outputDirectory = "some String"
- cacheRoot = null as String
- impliedPlatforms = new ArrayList<String>()
- }
- dokka.configuration.with {
- moduleName = "some String"
- classpath = Arrays.asList("someClassDir")
- includes = Collections.<String> emptyList()
- samples = Collections.<String> emptyList()
- jdkVersion = 6
- sourceRoots = new ArrayList<GradleSourceRootImpl>() as List<DokkaConfiguration.SourceRoot>
-
- includeNonPublic = false
- skipDeprecated = false
- skipEmptyPackages = true
- reportUndocumented = true
- perPackageOptions = new ArrayList<GradlePackageOptionsImpl>() as List<DokkaConfiguration.PackageOptions>
- externalDocumentationLinks = new ArrayList<DokkaConfiguration.ExternalDocumentationLink>()
- noStdlibLink = false
- languageVersion = null as String
- apiVersion = null as String
- sourceRoot(new Action<GradleSourceRootImpl>() {
- @Override
- void execute(GradleSourceRootImpl sourceRoot) {
- sourceRoot.path = "some String"
- }
- })
- externalDocumentationLink(new Action<GradleExternalDocumentationLinkImpl>() {
- @Override
- void execute(GradleExternalDocumentationLinkImpl link) {
- link.url = uri("some URI").toURL()
- link.packageListUrl = uri("some URI").toURL()
- }
- })
- kotlinTasks(new Callable<List<Object>>() {
- @Override
- List<Object> call() {
- return defaultKotlinTasks()
- }
- })
- }
-}
-
-project.tasks.withType(DokkaTask) { dokka ->
- configureDokkaTypeSafely(dokka)
-}
diff --git a/integration-tests/gradle-integration-tests/testData/typeSafeConfiguration/settings.gradle b/integration-tests/gradle-integration-tests/testData/typeSafeConfiguration/settings.gradle
deleted file mode 100644
index be82e328..00000000
--- a/integration-tests/gradle-integration-tests/testData/typeSafeConfiguration/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = "type-safe-configuration" \ No newline at end of file