Move kotlinTasks, update README, minor refactoring

8 files changed, 20 insertions, 37 deletions

diff --git a/runners/gradle-integration-tests/testData/androidApp/app/build.gradle b/runners/gradle-integration-tests/testData/androidApp/app/build.gradle
index 20f22f21..74d65e57 100644
--- a/runners/gradle-integration-tests/testData/androidApp/app/build.gradle
+++ b/runners/gradle-integration-tests/testData/androidApp/app/build.gradle
@@ -42,10 +42,5 @@ android {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$test_kotlin_version"
-    defaultDokkaRuntime files(dokka_fatjar)
-}
-
-
-dokka {
-    dokkaFatJar = dokka_fatjar
+    dokkaRuntime files(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 0679ee89..e62b6f3d 100644
--- a/runners/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle
+++ b/runners/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle
@@ -41,11 +41,10 @@ android {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$test_kotlin_version"
-    defaultDokkaRuntime files(dokka_fatjar)
+    dokkaRuntime files(dokka_fatjar)
 }
 
 
 dokka {
     outputFormat = "javadoc"
-    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 8706a076..5f2b0d77 100644
--- a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle
+++ b/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle
@@ -27,11 +27,10 @@ android {
 
 dependencies {
     api(project(":jlib"))
-    defaultDokkaRuntime files(dokka_fatjar)
+    dokkaRuntime files(dokka_fatjar)
 }
 
 dokka {
-    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 7d8b1490..1d35b37e 100644
--- a/runners/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle
+++ b/runners/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle
@@ -57,22 +57,20 @@ android {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$test_kotlin_version"
-    defaultDokkaRuntime files(dokka_fatjar)
+    dokkaRuntime files(dokka_fatjar)
 }
 
 
 dokka {
     outputDirectory = "$buildDir/dokka/all"
-    dokkaFatJar = dokka_fatjar
 }
 
 task dokkaFullFlavourOnly(type: org.jetbrains.dokka.gradle.DokkaAndroidTask) {
-    kotlinTasks {
-        ["compileFullReleaseKotlin"]
-    }
-    dokkaFatJar = dokka_fatjar
     outputDirectory = "$buildDir/dokka/fullOnly"
     configuration {
         moduleName = "full"
+        kotlinTasks {
+            ["compileFullReleaseKotlin"]
+        }
     }
 }
\ 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 b6f85604..79645204 100644
--- a/runners/gradle-integration-tests/testData/basic/build.gradle
+++ b/runners/gradle-integration-tests/testData/basic/build.gradle
@@ -29,14 +29,13 @@ repositories {
 }
 
 dependencies {
-    defaultDokkaRuntime files(dokka_fatjar)
+    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 {
-    dokkaFatJar = dokka_fatjar
     configuration {
         classpath += "$projectDir/classDir"
     }
diff --git a/runners/gradle-integration-tests/testData/multiProjectSingleOut/build.gradle b/runners/gradle-integration-tests/testData/multiProjectSingleOut/build.gradle
index 3ab2b220..0ea86d4c 100644
--- a/runners/gradle-integration-tests/testData/multiProjectSingleOut/build.gradle
+++ b/runners/gradle-integration-tests/testData/multiProjectSingleOut/build.gradle
@@ -23,14 +23,15 @@ subprojects {
 }
 
 dependencies {
-    defaultDokkaRuntime files(dokka_fatjar)
+    dokkaRuntime files(dokka_fatjar)
 }
 
 apply plugin: 'org.jetbrains.dokka'
 
 dokka {
-    kotlinTasks {
-        [":subA:compileKotlin", ":subB:compileKotlin"]
+    configuration {
+        kotlinTasks {
+            [":subA:compileKotlin", ":subB:compileKotlin"]
+        }
     }
-    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 880de5e5..a6270e23 100644
--- a/runners/gradle-integration-tests/testData/sourcesChange/build.gradle
+++ b/runners/gradle-integration-tests/testData/sourcesChange/build.gradle
@@ -29,12 +29,7 @@ repositories {
 }
 
 dependencies {
-    defaultDokkaRuntime files(dokka_fatjar)
+    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 {
-    dokkaFatJar = dokka_fatjar
 }
\ No newline at end of file
diff --git a/runners/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle b/runners/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle
index 8e25aaf1..8688ae41 100644
--- a/runners/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle
+++ b/runners/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle
@@ -26,16 +26,8 @@ def configureDokkaTypeSafely(DokkaTask dokka) {
     dokka.with {
         outputFormat = "some String"
         outputDirectory = "some String"
-        dokkaFatJar = "some String"
         cacheRoot = null as String
         impliedPlatforms = new ArrayList<String>()
-
-        kotlinTasks(new Callable<List<Object>>() {
-            @Override
-            List<Object> call() {
-                return defaultKotlinTasks()
-            }
-        })
     }
     dokka.configuration.with {
         moduleName = "some String"
@@ -67,7 +59,12 @@ def configureDokkaTypeSafely(DokkaTask dokka) {
                 link.packageListUrl = uri("some URI").toURL()
             }
         })
-
+        kotlinTasks(new Callable<List<Object>>() {
+            @Override
+            List<Object> call() {
+                return defaultKotlinTasks()
+            }
+        })
     }
 }