From 9e243a469ae6544e8cf523ad09b959f541c3f565 Mon Sep 17 00:00:00 2001 From: Robert Jaros Date: Wed, 11 Mar 2020 16:18:17 +0100 Subject: Upgrade to Kotlin 1.3.70 + other dependencies (Coroutinse, Serialization, Spring Boot) Major refactoring of build architecture. --- kvision-tools/kvision-compiler-plugin/build.gradle | 16 ----------- .../kvision-compiler-plugin/build.gradle.kts | 33 ++++++++++++++++++++++ .../pl/treksoft/kvision/annotations/Annotations.kt | 25 ++++++++++++++++ .../kvision/plugin/CommonComponentRegistrar.kt | 2 -- ...rains.kotlin.compiler.plugin.ComponentRegistrar | 1 + 5 files changed, 59 insertions(+), 18 deletions(-) delete mode 100644 kvision-tools/kvision-compiler-plugin/build.gradle create mode 100644 kvision-tools/kvision-compiler-plugin/build.gradle.kts create mode 100644 kvision-tools/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/annotations/Annotations.kt create mode 100644 kvision-tools/kvision-compiler-plugin/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar (limited to 'kvision-tools/kvision-compiler-plugin') 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("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 -- cgit