From 487dba687ad0891eebe61433c83c9ad5bf529b7b Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Fri, 3 Nov 2017 18:39:42 +0300
Subject: Fix pom generation for dokka-android-plugin

Workaround for johnrengelman/shadow#334
---
 runners/android-gradle-plugin/build.gradle | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'runners/android-gradle-plugin')

diff --git a/runners/android-gradle-plugin/build.gradle b/runners/android-gradle-plugin/build.gradle
index 8e97d9d9..193b8eee 100644
--- a/runners/android-gradle-plugin/build.gradle
+++ b/runners/android-gradle-plugin/build.gradle
@@ -1,3 +1,5 @@
+import org.jetbrains.CorrectShadowPublishing
+
 apply plugin: 'java'
 apply plugin: 'kotlin'
 
@@ -47,13 +49,14 @@ apply plugin: 'maven-publish'
 
 publishing {
     publications {
-        dokkaAndroidGradlePlugin(MavenPublication) { publication ->
+        dokkaAndroidGradlePlugin(MavenPublication) { MavenPublication publication ->
             artifactId = 'dokka-android-gradle-plugin'
 
             artifact sourceJar {
                 classifier "sources"
             }
-            project.shadow.component(publication)
+
+            CorrectShadowPublishing.configure(publication, project)
         }
     }
 }
-- 
cgit 


From f94beaa25f07333ad47738d5d7fafdd3dd302b04 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Tue, 14 Nov 2017 16:19:46 +0300
Subject: Clarify Kotlin Versions and config in project

---
 runners/android-gradle-plugin/build.gradle | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'runners/android-gradle-plugin')

diff --git a/runners/android-gradle-plugin/build.gradle b/runners/android-gradle-plugin/build.gradle
index 193b8eee..5050fd87 100644
--- a/runners/android-gradle-plugin/build.gradle
+++ b/runners/android-gradle-plugin/build.gradle
@@ -3,13 +3,19 @@ import org.jetbrains.CorrectShadowPublishing
 apply plugin: 'java'
 apply plugin: 'kotlin'
 
-sourceCompatibility = 1.8
 
 apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: "com.gradle.plugin-publish"
 
-tasks.withType(AbstractCompile) {
-    classpath += configurations.shadow
+sourceCompatibility = 1.8
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+    kotlinOptions {
+        freeCompilerArgs += "-Xjsr305=strict"
+        languageVersion = "1.2"
+        apiVersion = "1.0"
+        jvmTarget = "1.8"
+    }
 }
 
 repositories {
-- 
cgit 


From 56213b9d66a78fdd35c2826c6edc3f36d491ff32 Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Mon, 29 Jan 2018 19:53:23 +0300
Subject: Update Gradle Kotlin Runtime dependencies version to 1.1

Dokka drops support for Gradle less then 3.5
---
 runners/android-gradle-plugin/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runners/android-gradle-plugin')

diff --git a/runners/android-gradle-plugin/build.gradle b/runners/android-gradle-plugin/build.gradle
index 5050fd87..7d286cc7 100644
--- a/runners/android-gradle-plugin/build.gradle
+++ b/runners/android-gradle-plugin/build.gradle
@@ -13,7 +13,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     kotlinOptions {
         freeCompilerArgs += "-Xjsr305=strict"
         languageVersion = "1.2"
-        apiVersion = "1.0"
+        apiVersion = "1.1"
         jvmTarget = "1.8"
     }
 }
-- 
cgit 


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

---
 runners/android-gradle-plugin/build.gradle | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'runners/android-gradle-plugin')

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"
-- 
cgit