7 files changed, 21 insertions, 9 deletions
diff --git a/runners/gradle-integration-tests/testData/androidApp/app/build.gradle b/runners/gradle-integration-tests/testData/androidApp/app/build.gradle
index 1555de9f..20f22f21 100644
--- a/runners/gradle-integration-tests/testData/androidApp/app/build.gradle
+++ b/runners/gradle-integration-tests/testData/androidApp/app/build.gradle
@@ -42,9 +42,10 @@ android {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$test_kotlin_version"
+    defaultDokkaRuntime files(dokka_fatjar)
 }
 
 
 dokka {
-    dokkaFatJar = new File(dokka_fatjar)
+    dokkaFatJar = dokka_fatjar
 }
 \ No newline at end of file
diff --git a/runners/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle b/runners/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle
index 6a053a5e..0679ee89 100644
--- a/runners/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle
+++ b/runners/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle
@@ -41,10 +41,11 @@ android {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$test_kotlin_version"
+    defaultDokkaRuntime files(dokka_fatjar)
 }
 
 
 dokka {
     outputFormat = "javadoc"
-    dokkaFatJar = new File(dokka_fatjar)
+    dokkaFatJar = dokka_fatjar
 }
 \ No newline at end of file
diff --git a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle b/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle
index 82215a44..8706a076 100644
--- a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle
+++ b/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle
@@ -27,10 +27,11 @@ android {
 
 dependencies {
     api(project(":jlib"))
+    defaultDokkaRuntime files(dokka_fatjar)
 }
 
 dokka {
-    dokkaFatJar = files(dokka_fatjar)
+    dokkaFatJar = dokka_fatjar
     configuration {
         externalDocumentationLink {
             url = new URL("https://example.com")
diff --git a/runners/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle b/runners/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle
index ee68ba6d..a8e4db78 100644
--- a/runners/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle
+++ b/runners/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle
@@ -57,19 +57,20 @@ android {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$test_kotlin_version"
+    defaultDokkaRuntime files(dokka_fatjar)
 }
 
 
 dokka {
     outputDirectory = "$buildDir/dokka/all"
-    dokkaFatJar = new File(dokka_fatjar)
+    dokkaFatJar = dokka_fatjar
 }
 
 task dokkaFullFlavourOnly(type: org.jetbrains.dokka.gradle.DokkaAndroidTask) {
     kotlinTasks {
         ["compileFullReleaseKotlin"]
     }
-    dokkaFatJar = new File(dokka_fatjar)
+    dokkaFatJar = dokka_fatjar
     outputDirectory = "$buildDir/dokka/fullOnly"
     moduleName = "full"
 }
 \ No newline at end of file
diff --git a/runners/gradle-integration-tests/testData/basic/build.gradle b/runners/gradle-integration-tests/testData/basic/build.gradle
index 85e86748..b6f85604 100644
--- a/runners/gradle-integration-tests/testData/basic/build.gradle
+++ b/runners/gradle-integration-tests/testData/basic/build.gradle
@@ -29,12 +29,15 @@ repositories {
 }
 
 dependencies {
+    defaultDokkaRuntime 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 {
-    dokkaFatJar = files(dokka_fatjar)
-    classpath += files("$projectDir/classDir")
+    dokkaFatJar = dokka_fatjar
+    configuration {
+        classpath += "$projectDir/classDir"
+    }
 }
 \ No newline at end of file
diff --git a/runners/gradle-integration-tests/testData/multiProjectSingleOut/build.gradle b/runners/gradle-integration-tests/testData/multiProjectSingleOut/build.gradle
index 4f561472..3ab2b220 100644
--- a/runners/gradle-integration-tests/testData/multiProjectSingleOut/build.gradle
+++ b/runners/gradle-integration-tests/testData/multiProjectSingleOut/build.gradle
@@ -22,11 +22,15 @@ subprojects {
     }
 }
 
+dependencies {
+    defaultDokkaRuntime files(dokka_fatjar)
+}
+
 apply plugin: 'org.jetbrains.dokka'
 
 dokka {
     kotlinTasks {
         [":subA:compileKotlin", ":subB:compileKotlin"]
     }
-    dokkaFatJar = new File(dokka_fatjar)
+    dokkaFatJar = dokka_fatjar
 }
 \ No newline at end of file
diff --git a/runners/gradle-integration-tests/testData/sourcesChange/build.gradle b/runners/gradle-integration-tests/testData/sourcesChange/build.gradle
index f436afb4..880de5e5 100644
--- a/runners/gradle-integration-tests/testData/sourcesChange/build.gradle
+++ b/runners/gradle-integration-tests/testData/sourcesChange/build.gradle
@@ -29,11 +29,12 @@ repositories {
 }
 
 dependencies {
+    defaultDokkaRuntime 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 {
-    dokkaFatJar = files(dokka_fatjar)
+    dokkaFatJar = dokka_fatjar
 }
 \ No newline at end of file