Move gradle-integration-tests to new module

109 files changed, 16 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
index 0c5476ae..a6376444 100644
--- a/.gitignore
+++ b/.gitignore
@@ -94,4 +94,4 @@ gradle-app.setting
 local.properties
 android.local.properties
 
-!runners/gradle-integration-tests/testData/basic/classDir/**/*.class
\ No newline at end of file
+!integration-tests/gradle-integration-tests/testData/basic/classDir/**/*.class
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 290541c7..f9fe22d1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Wed Sep 18 14:13:14 CEST 2019
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/integration-tests/build.gradle b/integration-tests/build.gradle
new file mode 100644
index 00000000..23d232d2
--- /dev/null
+++ b/integration-tests/build.gradle
@@ -0,0 +1,7 @@
+subprojects {
+    buildscript {
+        dependencies {
+            classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        }
+    }
+}
\ No newline at end of file
diff --git a/runners/gradle-integration-tests/android-licenses/android-sdk-license b/integration-tests/gradle-integration-tests/android-licenses/android-sdk-license
index c311cf48..c311cf48 100644
--- a/runners/gradle-integration-tests/android-licenses/android-sdk-license
+++ b/integration-tests/gradle-integration-tests/android-licenses/android-sdk-license
diff --git a/runners/gradle-integration-tests/android-licenses/android-sdk-preview-license b/integration-tests/gradle-integration-tests/android-licenses/android-sdk-preview-license
index da4552d2..da4552d2 100644
--- a/runners/gradle-integration-tests/android-licenses/android-sdk-preview-license
+++ b/integration-tests/gradle-integration-tests/android-licenses/android-sdk-preview-license
diff --git a/runners/gradle-integration-tests/build.gradle b/integration-tests/gradle-integration-tests/build.gradle
index 2430d46b..bbbf2e33 100644
--- a/runners/gradle-integration-tests/build.gradle
+++ b/integration-tests/gradle-integration-tests/build.gradle
@@ -49,7 +49,7 @@ task createClasspathManifest {
 }
 
 
-createClasspathManifest.mustRunAfter project(":runners:fatjar").shadowJar
+createClasspathManifest.mustRunAfter project(":runners:fatjar").getTasksByName("shadowJar", true)
 testClasses.dependsOn project(":runners:fatjar").shadowJar
 testClasses.dependsOn createClasspathManifest
 
diff --git a/runners/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
index c3fe2ea9..c3fe2ea9 100644
--- a/runners/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
diff --git a/runners/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
index 334fc7c8..334fc7c8 100644
--- a/runners/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
diff --git a/runners/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
index 4814e707..4814e707 100644
--- a/runners/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
diff --git a/runners/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
index bbb63909..bbb63909 100644
--- a/runners/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
diff --git a/runners/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
index 9bc52273..9bc52273 100644
--- a/runners/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
diff --git a/runners/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
index ef1b94d8..ef1b94d8 100644
--- a/runners/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
diff --git a/runners/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
index 2e1a0d41..2e1a0d41 100644
--- a/runners/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
diff --git a/runners/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
index 3a4d08b8..3a4d08b8 100644
--- a/runners/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
diff --git a/runners/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
index 9458528c..9458528c 100644
--- a/runners/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
diff --git a/runners/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
index 3e61d79e..3e61d79e 100644
--- a/runners/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
diff --git a/runners/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
index 8b2db560..8b2db560 100644
--- a/runners/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
diff --git a/runners/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
index 7b179e92..7b179e92 100644
--- a/runners/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
diff --git a/runners/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
index 6f17af22..6f17af22 100644
--- a/runners/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
diff --git a/runners/gradle-integration-tests/testData/androidApp/app/build.gradle b/integration-tests/gradle-integration-tests/testData/androidApp/app/build.gradle
index 2420107c..2420107c 100644
--- a/runners/gradle-integration-tests/testData/androidApp/app/build.gradle
+++ b/integration-tests/gradle-integration-tests/testData/androidApp/app/build.gradle
diff --git a/runners/gradle-integration-tests/testData/androidApp/app/src/main/AndroidManifest.xml b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/AndroidManifest.xml
index b4e1a892..b4e1a892 100644
--- a/runners/gradle-integration-tests/testData/androidApp/app/src/main/AndroidManifest.xml
+++ b/integration-tests/gradle-integration-tests/testData/androidApp/app/src/main/AndroidManifest.xml
diff --git a/runners/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
index 3668c594..3668c594 100644
--- a/runners/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
diff --git a/runners/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
index ca2f27b0..ca2f27b0 100644
--- a/runners/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
diff --git a/runners/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
index 96a442e5..96a442e5 100644
--- a/runners/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
diff --git a/runners/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
index 359047df..359047df 100644
--- a/runners/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
diff --git a/runners/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
index 71c6d760..71c6d760 100644
--- a/runners/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
diff --git a/runners/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
index ede57c39..ede57c39 100644
--- a/runners/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
diff --git a/runners/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
index d707536a..d707536a 100644
--- a/runners/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
diff --git a/runners/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
index f3b10b6c..f3b10b6c 100644
--- a/runners/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
diff --git a/runners/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
index f3b10b6c..f3b10b6c 100644
--- a/runners/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
diff --git a/runners/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
index 47c82246..47c82246 100644
--- a/runners/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
diff --git a/runners/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
index d8f08bc2..d8f08bc2 100644
--- a/runners/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
diff --git a/runners/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
index 6ce89c7b..6ce89c7b 100644
--- a/runners/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
diff --git a/runners/gradle-integration-tests/testData/androidApp/build.gradle b/integration-tests/gradle-integration-tests/testData/androidApp/build.gradle
index 35356b90..35356b90 100644
--- a/runners/gradle-integration-tests/testData/androidApp/build.gradle
+++ b/integration-tests/gradle-integration-tests/testData/androidApp/build.gradle
diff --git a/runners/gradle-integration-tests/testData/androidApp/fileTree.txt b/integration-tests/gradle-integration-tests/testData/androidApp/fileTree.txt
index f66c79e3..f66c79e3 100644
--- a/runners/gradle-integration-tests/testData/androidApp/fileTree.txt
+++ b/integration-tests/gradle-integration-tests/testData/androidApp/fileTree.txt
diff --git a/runners/gradle-integration-tests/testData/androidApp/settings.gradle b/integration-tests/gradle-integration-tests/testData/androidApp/settings.gradle
index 1feb2867..1feb2867 100644
--- a/runners/gradle-integration-tests/testData/androidApp/settings.gradle
+++ b/integration-tests/gradle-integration-tests/testData/androidApp/settings.gradle
diff --git a/runners/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle
index 66421f52..66421f52 100644
--- a/runners/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle
+++ b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle
diff --git a/runners/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/AndroidManifest.xml b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/AndroidManifest.xml
index b4e1a892..b4e1a892 100644
--- a/runners/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/AndroidManifest.xml
+++ b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/app/src/main/AndroidManifest.xml
diff --git a/runners/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
index 3668c594..3668c594 100644
--- a/runners/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
diff --git a/runners/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
index ca2f27b0..ca2f27b0 100644
--- a/runners/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
diff --git a/runners/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
index 96a442e5..96a442e5 100644
--- a/runners/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
diff --git a/runners/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
index 359047df..359047df 100644
--- a/runners/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
diff --git a/runners/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
index 71c6d760..71c6d760 100644
--- a/runners/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
diff --git a/runners/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
index ede57c39..ede57c39 100644
--- a/runners/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
diff --git a/runners/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
index d707536a..d707536a 100644
--- a/runners/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
diff --git a/runners/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
index f3b10b6c..f3b10b6c 100644
--- a/runners/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
diff --git a/runners/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
index f3b10b6c..f3b10b6c 100644
--- a/runners/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
diff --git a/runners/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
index 47c82246..47c82246 100644
--- a/runners/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
diff --git a/runners/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
index d8f08bc2..d8f08bc2 100644
--- a/runners/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
diff --git a/runners/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
index 6ce89c7b..6ce89c7b 100644
--- a/runners/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
diff --git a/runners/gradle-integration-tests/testData/androidAppJavadoc/build.gradle b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/build.gradle
index 35356b90..35356b90 100644
--- a/runners/gradle-integration-tests/testData/androidAppJavadoc/build.gradle
+++ b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/build.gradle
diff --git a/runners/gradle-integration-tests/testData/androidAppJavadoc/fileTree.txt b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/fileTree.txt
index c5e79eba..c5e79eba 100644
--- a/runners/gradle-integration-tests/testData/androidAppJavadoc/fileTree.txt
+++ b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/fileTree.txt
diff --git a/runners/gradle-integration-tests/testData/androidAppJavadoc/settings.gradle b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/settings.gradle
index a4e67fea..a4e67fea 100644
--- a/runners/gradle-integration-tests/testData/androidAppJavadoc/settings.gradle
+++ b/integration-tests/gradle-integration-tests/testData/androidAppJavadoc/settings.gradle
diff --git a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/build.gradle b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/build.gradle
index 736668ab..736668ab 100644
--- a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/build.gradle
+++ b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/build.gradle
diff --git a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/fileTree.txt b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/fileTree.txt
index 6c96a01c..6c96a01c 100644
--- a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/fileTree.txt
+++ b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/fileTree.txt
diff --git a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/jlib/build.gradle b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/jlib/build.gradle
index bbfeb03c..bbfeb03c 100644
--- a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/jlib/build.gradle
+++ b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/jlib/build.gradle
diff --git a/runners/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
index 1d9a6fb2..1d9a6fb2 100644
--- a/runners/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
diff --git a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle
index b1ee52ab..b1ee52ab 100644
--- a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle
+++ b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle
diff --git a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/AndroidManifest.xml b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/AndroidManifest.xml
index 267f6efd..267f6efd 100644
--- a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/AndroidManifest.xml
+++ b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/src/main/AndroidManifest.xml
diff --git a/runners/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
index d034a3a9..d034a3a9 100644
--- a/runners/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
diff --git a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/package-list b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/package-list
index bf76058e..bf76058e 100644
--- a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/package-list
+++ b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/package-list
diff --git a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/settings.gradle b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/settings.gradle
index 5b4250a0..5b4250a0 100644
--- a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/settings.gradle
+++ b/integration-tests/gradle-integration-tests/testData/androidLibDependsOnJavaLib/settings.gradle
diff --git a/runners/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle
index 660257ab..660257ab 100644
--- a/runners/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle
+++ b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle
diff --git a/runners/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/AndroidManifest.xml b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/AndroidManifest.xml
index 3ecbcd3a..3ecbcd3a 100644
--- a/runners/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/AndroidManifest.xml
+++ b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/free/AndroidManifest.xml
diff --git a/runners/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
index b0b980fd..b0b980fd 100644
--- a/runners/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
diff --git a/runners/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
index e6443d05..e6443d05 100644
--- a/runners/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
diff --git a/runners/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
index bbdf2d06..bbdf2d06 100644
--- a/runners/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
diff --git a/runners/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/AndroidManifest.xml b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/AndroidManifest.xml
index b4e1a892..b4e1a892 100644
--- a/runners/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/AndroidManifest.xml
+++ b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/app/src/main/AndroidManifest.xml
diff --git a/runners/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
index 3668c594..3668c594 100644
--- a/runners/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
diff --git a/runners/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
index ca2f27b0..ca2f27b0 100644
--- a/runners/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
diff --git a/runners/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
index 96a442e5..96a442e5 100644
--- a/runners/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
diff --git a/runners/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
index 359047df..359047df 100644
--- a/runners/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
diff --git a/runners/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
index 71c6d760..71c6d760 100644
--- a/runners/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
diff --git a/runners/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
index ede57c39..ede57c39 100644
--- a/runners/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
diff --git a/runners/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
index d707536a..d707536a 100644
--- a/runners/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
diff --git a/runners/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
index f3b10b6c..f3b10b6c 100644
--- a/runners/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
diff --git a/runners/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
index f3b10b6c..f3b10b6c 100644
--- a/runners/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
diff --git a/runners/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
index 47c82246..47c82246 100644
--- a/runners/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
diff --git a/runners/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
index d8f08bc2..d8f08bc2 100644
--- a/runners/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
diff --git a/runners/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
index 6ce89c7b..6ce89c7b 100644
--- a/runners/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
diff --git a/runners/gradle-integration-tests/testData/androidMultiFlavourApp/build.gradle b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/build.gradle
index 35356b90..35356b90 100644
--- a/runners/gradle-integration-tests/testData/androidMultiFlavourApp/build.gradle
+++ b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/build.gradle
diff --git a/runners/gradle-integration-tests/testData/androidMultiFlavourApp/fileTree.txt b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/fileTree.txt
index 77b563b2..77b563b2 100644
--- a/runners/gradle-integration-tests/testData/androidMultiFlavourApp/fileTree.txt
+++ b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/fileTree.txt
diff --git a/runners/gradle-integration-tests/testData/androidMultiFlavourApp/settings.gradle b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/settings.gradle
index 1feb2867..1feb2867 100644
--- a/runners/gradle-integration-tests/testData/androidMultiFlavourApp/settings.gradle
+++ b/integration-tests/gradle-integration-tests/testData/androidMultiFlavourApp/settings.gradle
diff --git a/runners/gradle-integration-tests/testData/basic/build.gradle b/integration-tests/gradle-integration-tests/testData/basic/build.gradle
index 79645204..79645204 100644
--- a/runners/gradle-integration-tests/testData/basic/build.gradle
+++ b/integration-tests/gradle-integration-tests/testData/basic/build.gradle
diff --git a/runners/gradle-integration-tests/testData/basic/classDir/p1/MyBinaryClass.class b/integration-tests/gradle-integration-tests/testData/basic/classDir/p1/MyBinaryClass.class
index ccfff300..ccfff300 100644
--- a/runners/gradle-integration-tests/testData/basic/classDir/p1/MyBinaryClass.class
+++ b/integration-tests/gradle-integration-tests/testData/basic/classDir/p1/MyBinaryClass.class
diff --git a/runners/gradle-integration-tests/testData/basic/fileTree.txt b/integration-tests/gradle-integration-tests/testData/basic/fileTree.txt
index 2ceae371..2ceae371 100644
--- a/runners/gradle-integration-tests/testData/basic/fileTree.txt
+++ b/integration-tests/gradle-integration-tests/testData/basic/fileTree.txt
diff --git a/runners/gradle-integration-tests/testData/basic/settings.gradle b/integration-tests/gradle-integration-tests/testData/basic/settings.gradle
index c36a146c..c36a146c 100644
--- a/runners/gradle-integration-tests/testData/basic/settings.gradle
+++ b/integration-tests/gradle-integration-tests/testData/basic/settings.gradle
diff --git a/runners/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
index 3d7bcb51..3d7bcb51 100644
--- a/runners/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
diff --git a/runners/gradle-integration-tests/testData/multiProjectSingleOut/build.gradle b/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/build.gradle
index 0ea86d4c..0ea86d4c 100644
--- a/runners/gradle-integration-tests/testData/multiProjectSingleOut/build.gradle
+++ b/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/build.gradle
diff --git a/runners/gradle-integration-tests/testData/multiProjectSingleOut/fileTree.txt b/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/fileTree.txt
index 5624fca6..5624fca6 100644
--- a/runners/gradle-integration-tests/testData/multiProjectSingleOut/fileTree.txt
+++ b/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/fileTree.txt
diff --git a/runners/gradle-integration-tests/testData/multiProjectSingleOut/settings.gradle b/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/settings.gradle
index 283cc526..283cc526 100644
--- a/runners/gradle-integration-tests/testData/multiProjectSingleOut/settings.gradle
+++ b/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/settings.gradle
diff --git a/runners/gradle-integration-tests/testData/multiProjectSingleOut/subA/build.gradle b/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subA/build.gradle
index 0600411e..0600411e 100644
--- a/runners/gradle-integration-tests/testData/multiProjectSingleOut/subA/build.gradle
+++ b/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subA/build.gradle
diff --git a/runners/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
index 126d7f3e..126d7f3e 100644
--- a/runners/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
diff --git a/runners/gradle-integration-tests/testData/multiProjectSingleOut/subB/build.gradle b/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subB/build.gradle
index 7b8ff9f3..7b8ff9f3 100644
--- a/runners/gradle-integration-tests/testData/multiProjectSingleOut/subB/build.gradle
+++ b/integration-tests/gradle-integration-tests/testData/multiProjectSingleOut/subB/build.gradle
diff --git a/runners/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
index 8a87590a..8a87590a 100644
--- a/runners/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
diff --git a/runners/gradle-integration-tests/testData/multiplatformProject/build.gradle b/integration-tests/gradle-integration-tests/testData/multiplatformProject/build.gradle
index b5454c55..b5454c55 100644
--- a/runners/gradle-integration-tests/testData/multiplatformProject/build.gradle
+++ b/integration-tests/gradle-integration-tests/testData/multiplatformProject/build.gradle
diff --git a/runners/gradle-integration-tests/testData/multiplatformProject/fileTree.txt b/integration-tests/gradle-integration-tests/testData/multiplatformProject/fileTree.txt
index e9cc847c..e9cc847c 100644
--- a/runners/gradle-integration-tests/testData/multiplatformProject/fileTree.txt
+++ b/integration-tests/gradle-integration-tests/testData/multiplatformProject/fileTree.txt
diff --git a/runners/gradle-integration-tests/testData/multiplatformProject/settings.gradle b/integration-tests/gradle-integration-tests/testData/multiplatformProject/settings.gradle
index 0bb1e91b..0bb1e91b 100644
--- a/runners/gradle-integration-tests/testData/multiplatformProject/settings.gradle
+++ b/integration-tests/gradle-integration-tests/testData/multiplatformProject/settings.gradle
diff --git a/runners/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
index a77b50f9..a77b50f9 100644
--- a/runners/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
diff --git a/runners/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
index 96d725fc..96d725fc 100644
--- a/runners/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
diff --git a/runners/gradle-integration-tests/testData/sourcesChange/build.gradle b/integration-tests/gradle-integration-tests/testData/sourcesChange/build.gradle
index a6270e23..a6270e23 100644
--- a/runners/gradle-integration-tests/testData/sourcesChange/build.gradle
+++ b/integration-tests/gradle-integration-tests/testData/sourcesChange/build.gradle
diff --git a/runners/gradle-integration-tests/testData/sourcesChange/fileTree.txt b/integration-tests/gradle-integration-tests/testData/sourcesChange/fileTree.txt
index 09f3724b..09f3724b 100644
--- a/runners/gradle-integration-tests/testData/sourcesChange/fileTree.txt
+++ b/integration-tests/gradle-integration-tests/testData/sourcesChange/fileTree.txt
diff --git a/runners/gradle-integration-tests/testData/sourcesChange/fileTree1.txt b/integration-tests/gradle-integration-tests/testData/sourcesChange/fileTree1.txt
index eeb377f7..eeb377f7 100644
--- a/runners/gradle-integration-tests/testData/sourcesChange/fileTree1.txt
+++ b/integration-tests/gradle-integration-tests/testData/sourcesChange/fileTree1.txt
diff --git a/runners/gradle-integration-tests/testData/sourcesChange/settings.gradle b/integration-tests/gradle-integration-tests/testData/sourcesChange/settings.gradle
index 3fb032bf..3fb032bf 100644
--- a/runners/gradle-integration-tests/testData/sourcesChange/settings.gradle
+++ b/integration-tests/gradle-integration-tests/testData/sourcesChange/settings.gradle
diff --git a/runners/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
index c54dea50..c54dea50 100644
--- a/runners/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
diff --git a/runners/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
index 53f22ff5..53f22ff5 100644
--- a/runners/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
diff --git a/runners/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle b/integration-tests/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle
index 8688ae41..8688ae41 100644
--- a/runners/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle
+++ b/integration-tests/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle
diff --git a/runners/gradle-integration-tests/testData/typeSafeConfiguration/settings.gradle b/integration-tests/gradle-integration-tests/testData/typeSafeConfiguration/settings.gradle
index be82e328..be82e328 100644
--- a/runners/gradle-integration-tests/testData/typeSafeConfiguration/settings.gradle
+++ b/integration-tests/gradle-integration-tests/testData/typeSafeConfiguration/settings.gradle
diff --git a/settings.gradle b/settings.gradle
index 46c6e871..d41c4a04 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,14 +1,13 @@
 rootProject.name = "dokka"
 
 include 'core',
+        'core:testApi',
+        'coreDependencies',
         'integration',
+        'integration-tests:gradle-integration-tests',
         'runners:fatjar',
         'runners:ant',
         'runners:cli',
         'runners:maven-plugin',
         'runners:gradle-plugin',
-        'runners:android-gradle-plugin',
-        'runners:gradle-integration-tests',
-        'coreDependencies',
-        'plugins:javadoc8',
-        'core:testApi'
+        'plugins:javadoc8'