From f8246d9e65f37ca64c136479d430abc8446aed98 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Wed, 14 Dec 2016 17:19:39 +0300
Subject: Manual integration of PR #93

---
 build.gradle                               |  5 +++++
 runners/android-gradle-plugin/build.gradle | 18 +++++++++++++++++-
 runners/gradle-plugin/build.gradle         | 15 +++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 7a2298f0..4f40690b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,10 +12,15 @@ allprojects {
             maven {
                 url "https://dl.bintray.com/kotlin/kotlin-dev"
             }
+            maven {
+                url "https://plugins.gradle.org/m2/"
+            }
         }
         dependencies {
             classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
             classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
+
+            classpath "com.gradle.publish:plugin-publish-plugin:0.9.6"
         }
     }
 
diff --git a/runners/android-gradle-plugin/build.gradle b/runners/android-gradle-plugin/build.gradle
index 4ea12edb..38f4f561 100644
--- a/runners/android-gradle-plugin/build.gradle
+++ b/runners/android-gradle-plugin/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'java'
 sourceCompatibility = 1.6
 
 apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: "com.gradle.plugin-publish"
 
 configurations {
     provided
@@ -52,4 +53,19 @@ publishing {
     }
 }
 
-bintrayPublication(project, ['dokkaAndroidGradlePlugin'])
\ No newline at end of file
+bintrayPublication(project, ['dokkaAndroidGradlePlugin'])
+
+
+pluginBundle {
+    website = 'http://www.kotlinlang.org/'
+    vcsUrl = 'https://github.com/kotlin/dokka.git'
+    description = 'Dokka, the Kotlin documentation tool'
+    tags = ['dokka', 'kotlin', 'android']
+
+    plugins {
+        dokkaAndroidGradlePlugin {
+            id = 'org.jetbrains.dokka-android'
+            displayName = 'Dokka Android plugin'
+        }
+    }
+}
\ No newline at end of file
diff --git a/runners/gradle-plugin/build.gradle b/runners/gradle-plugin/build.gradle
index 8e6f11df..acf2f822 100644
--- a/runners/gradle-plugin/build.gradle
+++ b/runners/gradle-plugin/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'java'
 sourceCompatibility = 1.6
 
 apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: "com.gradle.plugin-publish"
 
 configurations {
     provided
@@ -61,3 +62,17 @@ publishing {
 
 bintrayPublication(project, ['dokkaGradlePlugin'])
 
+
+pluginBundle {
+    website = 'http://www.kotlinlang.org/'
+    vcsUrl = 'https://github.com/kotlin/dokka.git'
+    description = 'Dokka, the Kotlin documentation tool'
+    tags = ['dokka', 'kotlin']
+
+    plugins {
+        dokkaGradlePlugin {
+            id = 'org.jetbrains.dokka'
+            displayName = 'Dokka plugin'
+        }
+    }
+}
\ No newline at end of file
-- 
cgit