From 7001425367a4db79c6fcdf6b8d0c53508ba50aa7 Mon Sep 17 00:00:00 2001
From: Aurimas Liutikas <aurimas@google.com>
Date: Mon, 13 Jul 2020 18:33:28 -0700
Subject: Simplify publishing configuration and enable sourcejars

---
 plugins/base/build.gradle.kts           | 13 ++-----------
 plugins/gfm/build.gradle.kts            | 15 +++------------
 plugins/javadoc/build.gradle.kts        | 13 ++-----------
 plugins/jekyll/build.gradle.kts         | 15 +++------------
 plugins/kotlin-as-java/build.gradle.kts | 13 ++-----------
 plugins/mathjax/build.gradle.kts        | 13 ++-----------
 plugins/xml/build.gradle.kts            | 11 +++--------
 7 files changed, 17 insertions(+), 76 deletions(-)

(limited to 'plugins')

diff --git a/plugins/base/build.gradle.kts b/plugins/base/build.gradle.kts
index 1fe3dbc2..61e2ef01 100644
--- a/plugins/base/build.gradle.kts
+++ b/plugins/base/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.configureBintrayPublication
+import org.jetbrains.configurePublication
 
 plugins {
     id("com.jfrog.bintray")
@@ -30,13 +30,4 @@ tasks {
     }
 }
 
-publishing {
-    publications {
-        register<MavenPublication>("basePlugin") {
-            artifactId = "dokka-base"
-            from(components["java"])
-        }
-    }
-}
-
-configureBintrayPublication("basePlugin")
+configurePublication("dokka-base")
diff --git a/plugins/gfm/build.gradle.kts b/plugins/gfm/build.gradle.kts
index fac2c1c0..73958046 100644
--- a/plugins/gfm/build.gradle.kts
+++ b/plugins/gfm/build.gradle.kts
@@ -1,18 +1,9 @@
-import org.jetbrains.configureBintrayPublication
-
-publishing {
-    publications {
-        register<MavenPublication>("gfmPlugin") {
-            artifactId = "gfm-plugin"
-            from(components["java"])
-        }
-    }
-}
-
-configureBintrayPublication("gfmPlugin")
+import org.jetbrains.configurePublication
 
 dependencies {
     implementation(project(":plugins:base"))
     testImplementation(project(":plugins:base"))
     testImplementation(project(":plugins:base:test-utils"))
 }
+
+configurePublication("gfm-plugin")
diff --git a/plugins/javadoc/build.gradle.kts b/plugins/javadoc/build.gradle.kts
index ebf79f8f..5846ee62 100644
--- a/plugins/javadoc/build.gradle.kts
+++ b/plugins/javadoc/build.gradle.kts
@@ -1,13 +1,4 @@
-import org.jetbrains.configureBintrayPublication
-
-publishing {
-    publications {
-        register<MavenPublication>("javadocPlugin") {
-            artifactId = "javadoc-plugin"
-            from(components["java"])
-        }
-    }
-}
+import org.jetbrains.configurePublication
 
 dependencies {
     implementation("com.soywiz.korlibs.korte:korte-jvm:1.10.3")
@@ -19,4 +10,4 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version")
 }
 
-configureBintrayPublication("javadocPlugin")
+configurePublication("javadoc-plugin")
diff --git a/plugins/jekyll/build.gradle.kts b/plugins/jekyll/build.gradle.kts
index 90002466..0d1e38d6 100644
--- a/plugins/jekyll/build.gradle.kts
+++ b/plugins/jekyll/build.gradle.kts
@@ -1,17 +1,8 @@
-import org.jetbrains.configureBintrayPublication
-
-publishing {
-    publications {
-        register<MavenPublication>("jekyllPlugin") {
-            artifactId = "jekyll-plugin"
-            from(components["java"])
-        }
-    }
-}
-
-configureBintrayPublication("jekyllPlugin")
+import org.jetbrains.configurePublication
 
 dependencies {
     implementation(project(":plugins:base"))
     implementation(project(":plugins:gfm"))
 }
+
+configurePublication("jekyll-plugin")
diff --git a/plugins/kotlin-as-java/build.gradle.kts b/plugins/kotlin-as-java/build.gradle.kts
index bd08ab92..27e90f84 100644
--- a/plugins/kotlin-as-java/build.gradle.kts
+++ b/plugins/kotlin-as-java/build.gradle.kts
@@ -1,13 +1,4 @@
-import org.jetbrains.configureBintrayPublication
-
-publishing {
-    publications {
-        register<MavenPublication>("kotlinAsJavaPlugin") {
-            artifactId = "kotlin-as-java-plugin"
-            from(components["java"])
-        }
-    }
-}
+import org.jetbrains.configurePublication
 
 dependencies {
     implementation(project(":plugins:base"))
@@ -16,4 +7,4 @@ dependencies {
     testImplementation(project(":test-tools"))
 }
 
-configureBintrayPublication("kotlinAsJavaPlugin")
\ No newline at end of file
+configurePublication("kotlin-as-java-plugin")
diff --git a/plugins/mathjax/build.gradle.kts b/plugins/mathjax/build.gradle.kts
index 67f4822f..ea4cdff0 100644
--- a/plugins/mathjax/build.gradle.kts
+++ b/plugins/mathjax/build.gradle.kts
@@ -1,12 +1,3 @@
-import org.jetbrains.configureBintrayPublication
+import org.jetbrains.configurePublication
 
-publishing {
-    publications {
-        register<MavenPublication>("mathjaxPlugin") {
-            artifactId = "mathjax-plugin"
-            from(components["java"])
-        }
-    }
-}
-
-configureBintrayPublication("mathjaxPlugin")
+configurePublication("mathjax-plugin")
diff --git a/plugins/xml/build.gradle.kts b/plugins/xml/build.gradle.kts
index cd65cfe4..5d3984bc 100644
--- a/plugins/xml/build.gradle.kts
+++ b/plugins/xml/build.gradle.kts
@@ -1,8 +1,3 @@
-publishing {
-    publications {
-        register<MavenPublication>("xmlPlugin") {
-            artifactId = "xml-plugin"
-            from(components["java"])
-        }
-    }
-}
\ No newline at end of file
+import org.jetbrains.configurePublication
+
+configurePublication("xml-plugin")
\ No newline at end of file
-- 
cgit