From 1c4a3c6b21846271bcdba3818ba323d1b0bb096f Mon Sep 17 00:00:00 2001
From: Kamil Doległo <kamilok1965@interia.pl>
Date: Thu, 22 Aug 2019 16:04:19 +0200
Subject: Merge Android plugin into Gradle plugin

---
 .../gradle-integration-tests/testData/androidApp/app/build.gradle    | 3 +--
 .../testData/androidAppJavadoc/app/build.gradle                      | 3 +--
 .../testData/androidLibDependsOnJavaLib/lib/build.gradle             | 3 +--
 .../testData/androidMultiFlavourApp/app/build.gradle                 | 5 ++---
 4 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'runners/gradle-integration-tests/testData')

diff --git a/runners/gradle-integration-tests/testData/androidApp/app/build.gradle b/runners/gradle-integration-tests/testData/androidApp/app/build.gradle
index 74d65e57..2420107c 100644
--- a/runners/gradle-integration-tests/testData/androidApp/app/build.gradle
+++ b/runners/gradle-integration-tests/testData/androidApp/app/build.gradle
@@ -9,14 +9,13 @@ buildscript {
 }
 
 plugins {
-    id 'org.jetbrains.dokka-android'
+    id 'org.jetbrains.dokka'
 }
 
 
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-apply plugin: 'org.jetbrains.dokka-android'
 
 android {
     compileSdkVersion Integer.parseInt(sdk_version)
diff --git a/runners/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle b/runners/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle
index e62b6f3d..66421f52 100644
--- a/runners/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle
+++ b/runners/gradle-integration-tests/testData/androidAppJavadoc/app/build.gradle
@@ -9,13 +9,12 @@ buildscript {
 }
 
 plugins {
-    id 'org.jetbrains.dokka-android'
+    id 'org.jetbrains.dokka'
 }
 
 
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'org.jetbrains.dokka-android'
 
 android {
     compileSdkVersion Integer.parseInt(sdk_version)
diff --git a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle b/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle
index 5f2b0d77..b1ee52ab 100644
--- a/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle
+++ b/runners/gradle-integration-tests/testData/androidLibDependsOnJavaLib/lib/build.gradle
@@ -7,13 +7,12 @@ buildscript {
 
 
 plugins {
-    id 'org.jetbrains.dokka-android'
+    id 'org.jetbrains.dokka'
 }
 
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'org.jetbrains.dokka-android'
 
 
 android {
diff --git a/runners/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle b/runners/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle
index 1d35b37e..660257ab 100644
--- a/runners/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle
+++ b/runners/gradle-integration-tests/testData/androidMultiFlavourApp/app/build.gradle
@@ -9,14 +9,13 @@ buildscript {
 }
 
 plugins {
-    id 'org.jetbrains.dokka-android'
+    id 'org.jetbrains.dokka'
 }
 
 
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-apply plugin: 'org.jetbrains.dokka-android'
 
 android {
     compileSdkVersion Integer.parseInt(sdk_version)
@@ -65,7 +64,7 @@ dokka {
     outputDirectory = "$buildDir/dokka/all"
 }
 
-task dokkaFullFlavourOnly(type: org.jetbrains.dokka.gradle.DokkaAndroidTask) {
+task dokkaFullFlavourOnly(type: org.jetbrains.dokka.gradle.DokkaTask) {
     outputDirectory = "$buildDir/dokka/fullOnly"
     configuration {
         moduleName = "full"
-- 
cgit