Upgrade to Kotlin 1.3.70 + other dependencies (Coroutinse, Serialization, Spring Boot)

Major refactoring of build architecture.

9 files changed, 104 insertions, 40 deletions

diff --git a/kvision-tools/kvision-compiler-plugin/build.gradle b/kvision-tools/kvision-compiler-plugin/build.gradle
deleted file mode 100644
index 3b00300c..00000000
--- a/kvision-tools/kvision-compiler-plugin/build.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-apply plugin: 'kotlin-platform-jvm'
-apply plugin: "kotlin-kapt"
-apply plugin: "maven"
-
-dependencies {
-    compile "de.jensklingenberg:mpapt-runtime:$mpaptRuntimeVersion"
-    expectedBy project(":kvision-modules:kvision-common-annotations")
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    compileOnly "org.jetbrains.kotlin:kotlin-compiler-embeddable"
-    compileOnly "com.google.auto.service:auto-service:$autoServiceVersion"
-    kapt "com.google.auto.service:auto-service:$autoServiceVersion"
-}
-
-kapt {
-    includeCompileClasspath = false
-}
diff --git a/kvision-tools/kvision-compiler-plugin/build.gradle.kts b/kvision-tools/kvision-compiler-plugin/build.gradle.kts
new file mode 100644
index 00000000..c27127d8
--- /dev/null
+++ b/kvision-tools/kvision-compiler-plugin/build.gradle.kts
@@ -0,0 +1,33 @@
+plugins {
+    kotlin("jvm")
+    id("maven-publish")
+}
+
+val mpaptRuntimeVersion: String by project
+
+repositories()
+
+dependencies {
+    implementation(kotlin("stdlib-jdk8"))
+    implementation("de.jensklingenberg:mpapt-runtime:$mpaptRuntimeVersion")
+    compileOnly("org.jetbrains.kotlin:kotlin-compiler-embeddable")
+}
+
+val sourcesJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("sources")
+    from(kotlin.sourceSets.main.get().kotlin)
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("kotlin") {
+            from(components["kotlin"])
+            artifact(tasks["sourcesJar"])
+            pom {
+                defaultPom()
+            }
+        }
+    }
+}
+
+setupPublication()
diff --git a/kvision-tools/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/annotations/Annotations.kt b/kvision-tools/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/annotations/Annotations.kt
new file mode 100644
index 00000000..22cf570b
--- /dev/null
+++ b/kvision-tools/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/annotations/Annotations.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2017-present Robert Jaros
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package pl.treksoft.kvision.annotations
+
+@Target(AnnotationTarget.CLASS)
+annotation class KVService
diff --git a/kvision-tools/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/plugin/CommonComponentRegistrar.kt b/kvision-tools/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/plugin/CommonComponentRegistrar.kt
index c71dbce8..07a4ddad 100644
--- a/kvision-tools/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/plugin/CommonComponentRegistrar.kt
+++ b/kvision-tools/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/plugin/CommonComponentRegistrar.kt
@@ -21,7 +21,6 @@
  */
 package pl.treksoft.kvision.plugin
 
-import com.google.auto.service.AutoService
 import de.jensklingenberg.mpapt.common.MpAptProject
 import org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension
 import org.jetbrains.kotlin.com.intellij.mock.MockProject
@@ -30,7 +29,6 @@ import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor
 import org.jetbrains.kotlin.js.translate.extensions.JsSyntheticTranslateExtension
 
-@AutoService(ComponentRegistrar::class)
 open class CommonComponentRegistrar : ComponentRegistrar {
 
     override fun registerProjectComponents(
diff --git a/kvision-tools/kvision-compiler-plugin/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar b/kvision-tools/kvision-compiler-plugin/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
new file mode 100644
index 00000000..60c3da5e
--- /dev/null
+++ b/kvision-tools/kvision-compiler-plugin/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
@@ -0,0 +1 @@
+pl.treksoft.kvision.plugin.CommonComponentRegistrar
diff --git a/kvision-tools/kvision-gradle-plugin/build.gradle b/kvision-tools/kvision-gradle-plugin/build.gradle
deleted file mode 100644
index 7b2d0f33..00000000
--- a/kvision-tools/kvision-gradle-plugin/build.gradle
+++ /dev/null
@@ -1,20 +0,0 @@
-apply plugin: 'kotlin-platform-jvm'
-apply plugin: "java-gradle-plugin"
-apply plugin: "kotlin-kapt"
-apply plugin: "maven"
-
-gradlePlugin {
-    plugins {
-        simplePlugin {
-            id = "pl.treksoft.kvision"
-            implementationClass = "pl.treksoft.kvision.gradle.KVisionGradlePlugin"
-        }
-    }
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    compile "org.jetbrains.kotlin:kotlin-gradle-plugin-api:$kotlinVersion"
-    compileOnly "com.google.auto.service:auto-service:$autoServiceVersion"
-    kapt "com.google.auto.service:auto-service:$autoServiceVersion"
-}
diff --git a/kvision-tools/kvision-gradle-plugin/build.gradle.kts b/kvision-tools/kvision-gradle-plugin/build.gradle.kts
new file mode 100644
index 00000000..a4cc5abb
--- /dev/null
+++ b/kvision-tools/kvision-gradle-plugin/build.gradle.kts
@@ -0,0 +1,44 @@
+plugins {
+    kotlin("jvm")
+    id("java-gradle-plugin")
+    id("maven-publish")
+}
+
+val kotlinVersion: String by System.getProperties()
+val autoServiceVersion: String by project
+
+repositories()
+
+gradlePlugin {
+    plugins {
+        isAutomatedPublishing = false
+        create("simplePlugin") {
+            id = "pl.treksoft.kvision"
+            implementationClass = "pl.treksoft.kvision.gradle.KVisionGradlePlugin"
+        }
+    }
+}
+
+dependencies {
+    implementation(kotlin("stdlib-jdk8"))
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin-api:$kotlinVersion")
+}
+
+val sourcesJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("sources")
+    from(kotlin.sourceSets.main.get().kotlin)
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("kotlin") {
+            from(components["kotlin"])
+            artifact(tasks["sourcesJar"])
+            pom {
+                defaultPom()
+            }
+        }
+    }
+}
+
+setupPublication()
diff --git a/kvision-tools/kvision-gradle-plugin/src/main/kotlin/pl/treksoft/kvision/gradle/KVisionGradleSubplugin.kt b/kvision-tools/kvision-gradle-plugin/src/main/kotlin/pl/treksoft/kvision/gradle/KVisionGradleSubplugin.kt
index 76bab0c0..59e2f202 100644
--- a/kvision-tools/kvision-gradle-plugin/src/main/kotlin/pl/treksoft/kvision/gradle/KVisionGradleSubplugin.kt
+++ b/kvision-tools/kvision-gradle-plugin/src/main/kotlin/pl/treksoft/kvision/gradle/KVisionGradleSubplugin.kt
@@ -21,7 +21,6 @@
  */
 package pl.treksoft.kvision.gradle
 
-import com.google.auto.service.AutoService
 import org.gradle.api.Project
 import org.gradle.api.tasks.compile.AbstractCompile
 import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
@@ -30,7 +29,6 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin
 import org.jetbrains.kotlin.gradle.plugin.SubpluginArtifact
 import org.jetbrains.kotlin.gradle.plugin.SubpluginOption
 
-@AutoService(KotlinGradleSubplugin::class)
 class KVisionGradleSubplugin : KotlinGradleSubplugin<AbstractCompile> {
     override fun apply(
         project: Project,
diff --git a/kvision-tools/kvision-gradle-plugin/src/main/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin b/kvision-tools/kvision-gradle-plugin/src/main/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin
new file mode 100644
index 00000000..82f481b9
--- /dev/null
+++ b/kvision-tools/kvision-gradle-plugin/src/main/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin
@@ -0,0 +1 @@
+pl.treksoft.kvision.gradle.KVisionGradleSubplugin