From e99be615ce7c2c2b5c3ee5e3f8941c41c1e7a944 Mon Sep 17 00:00:00 2001
From: Kamil Doległo <kamilok1965@interia.pl>
Date: Fri, 31 Jan 2020 00:37:29 +0100
Subject: Bump Gradle version, migrate to Kotlin DSL, refactor publishing

---
 plugins/build.gradle             | 25 -------------------------
 plugins/build.gradle.kts         | 11 +++++++++++
 plugins/mathjax/build.gradle     | 17 -----------------
 plugins/mathjax/build.gradle.kts |  8 ++++++++
 plugins/xml/build.gradle         | 17 -----------------
 plugins/xml/build.gradle.kts     |  8 ++++++++
 6 files changed, 27 insertions(+), 59 deletions(-)
 delete mode 100644 plugins/build.gradle
 create mode 100644 plugins/build.gradle.kts
 delete mode 100644 plugins/mathjax/build.gradle
 create mode 100644 plugins/mathjax/build.gradle.kts
 delete mode 100644 plugins/xml/build.gradle
 create mode 100644 plugins/xml/build.gradle.kts

(limited to 'plugins')

diff --git a/plugins/build.gradle b/plugins/build.gradle
deleted file mode 100644
index a0bc5ee1..00000000
--- a/plugins/build.gradle
+++ /dev/null
@@ -1,25 +0,0 @@
-buildscript {
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
-allprojects {
-    apply plugin: 'kotlin'
-
-    sourceCompatibility = 1.8
-
-    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-        kotlinOptions {
-            languageVersion = language_version
-            apiVersion = language_version
-            jvmTarget = "1.8"
-        }
-    }
-}
-
-subprojects {
-    dependencies {
-        testCompile project(':testApi')
-    }
-}
\ No newline at end of file
diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts
new file mode 100644
index 00000000..5f2f6dcb
--- /dev/null
+++ b/plugins/build.gradle.kts
@@ -0,0 +1,11 @@
+subprojects {
+    apply {
+        plugin("maven-publish")
+    }
+
+    dependencies {
+        compileOnly(project(":core"))
+        compileOnly(kotlin("stdlib-jdk8"))
+        testImplementation(project(":testApi"))
+    }
+}
\ No newline at end of file
diff --git a/plugins/mathjax/build.gradle b/plugins/mathjax/build.gradle
deleted file mode 100644
index 6578ff45..00000000
--- a/plugins/mathjax/build.gradle
+++ /dev/null
@@ -1,17 +0,0 @@
-import javax.tools.ToolProvider
-
-apply plugin: 'maven-publish'
-
-dependencies {
-    compileOnly project(':core')
-}
-
-publishing {
-    publications {
-        dokkaCore(MavenPublication) { publication ->
-            artifactId = 'mathjax-plugin'
-
-            from components.java
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/mathjax/build.gradle.kts b/plugins/mathjax/build.gradle.kts
new file mode 100644
index 00000000..0e9a16d0
--- /dev/null
+++ b/plugins/mathjax/build.gradle.kts
@@ -0,0 +1,8 @@
+publishing {
+    publications {
+        register<MavenPublication>("mathjaxPlugin") {
+            artifactId = "mathjax-plugin"
+            from(components["java"])
+        }
+    }
+}
\ No newline at end of file
diff --git a/plugins/xml/build.gradle b/plugins/xml/build.gradle
deleted file mode 100644
index ed4adb92..00000000
--- a/plugins/xml/build.gradle
+++ /dev/null
@@ -1,17 +0,0 @@
-import javax.tools.ToolProvider
-
-apply plugin: 'maven-publish'
-
-dependencies {
-    compileOnly project(':core')
-}
-
-publishing {
-    publications {
-        dokkaCore(MavenPublication) { publication ->
-            artifactId = 'xml-plugin'
-
-            from components.java
-        }
-    }
-}
\ No newline at end of file
diff --git a/plugins/xml/build.gradle.kts b/plugins/xml/build.gradle.kts
new file mode 100644
index 00000000..cd65cfe4
--- /dev/null
+++ b/plugins/xml/build.gradle.kts
@@ -0,0 +1,8 @@
+publishing {
+    publications {
+        register<MavenPublication>("xmlPlugin") {
+            artifactId = "xml-plugin"
+            from(components["java"])
+        }
+    }
+}
\ No newline at end of file
-- 
cgit