From 9530cb367eb1ad92b6ca5aa5261e28f76e7d4bad Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Tue, 20 Feb 2018 00:11:30 +0300
Subject: Update publish-plugin and fix publishing

---
 build.gradle                               | 2 +-
 runners/android-gradle-plugin/build.gradle | 7 +++++++
 runners/gradle-plugin/build.gradle         | 8 ++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index f3e2cc52..ee76c9cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ allprojects {
             classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
             classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1'
 
-            classpath "com.gradle.publish:plugin-publish-plugin:0.9.9"
+            classpath "com.gradle.publish:plugin-publish-plugin:0.9.10"
         }
     }
 
diff --git a/runners/android-gradle-plugin/build.gradle b/runners/android-gradle-plugin/build.gradle
index 7d286cc7..72d1be9e 100644
--- a/runners/android-gradle-plugin/build.gradle
+++ b/runners/android-gradle-plugin/build.gradle
@@ -1,3 +1,4 @@
+import com.gradle.publish.DependenciesBuilder
 import org.jetbrains.CorrectShadowPublishing
 
 apply plugin: 'java'
@@ -87,6 +88,12 @@ pluginBundle {
         }
     }
 
+    withDependencies { List<Dependency> list ->
+        list.clear()
+        def builder = new DependenciesBuilder()
+        builder.addUniqueScopedDependencies(list, configurations.shadow, "compile")
+    }
+
     mavenCoordinates {
         groupId = "org.jetbrains.dokka"
         artifactId = "dokka-android-gradle-plugin"
diff --git a/runners/gradle-plugin/build.gradle b/runners/gradle-plugin/build.gradle
index d3dbae22..661d432b 100644
--- a/runners/gradle-plugin/build.gradle
+++ b/runners/gradle-plugin/build.gradle
@@ -1,3 +1,5 @@
+import com.gradle.publish.DependenciesBuilder
+
 apply plugin: 'java'
 apply plugin: 'kotlin'
 
@@ -84,6 +86,12 @@ pluginBundle {
         }
     }
 
+    withDependencies { List<Dependency> list ->
+        list.clear()
+        def builder = new DependenciesBuilder()
+        builder.addUniqueScopedDependencies(list, configurations.shadow, "compile")
+    }
+
     mavenCoordinates {
         groupId = "org.jetbrains.dokka"
         artifactId = "dokka-gradle-plugin"
-- 
cgit