aboutsummaryrefslogtreecommitdiff
path: root/kvision-modules
diff options
context:
space:
mode:
authorRobert Jaros <rjaros@finn.pl>2019-10-17 18:53:08 +0200
committerRobert Jaros <rjaros@finn.pl>2019-10-17 18:53:08 +0200
commit53b325d52208bfd44ba6a524ce3dda5379aed699 (patch)
tree62f57b410bbe7c0a6e0ea725b2924f6d4b1294de /kvision-modules
parentb554eb31aba039c8dbb4cda7069cd4c6d53ada27 (diff)
downloadkvision-53b325d52208bfd44ba6a524ce3dda5379aed699.tar.gz
kvision-53b325d52208bfd44ba6a524ce3dda5379aed699.tar.bz2
kvision-53b325d52208bfd44ba6a524ce3dda5379aed699.zip
Move the plugins to the separate directory.
Fix common module detection.
Diffstat (limited to 'kvision-modules')
-rw-r--r--kvision-modules/kvision-compiler-plugin/build.gradle16
-rw-r--r--kvision-modules/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/plugin/CommonComponentRegistrar.kt47
-rw-r--r--kvision-modules/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/plugin/KVProcessor.kt209
-rw-r--r--kvision-modules/kvision-gradle-plugin/build.gradle20
-rw-r--r--kvision-modules/kvision-gradle-plugin/src/main/kotlin/pl/treksoft/kvision/gradle/KVisionGradlePlugin.kt30
-rw-r--r--kvision-modules/kvision-gradle-plugin/src/main/kotlin/pl/treksoft/kvision/gradle/KVisionGradleSubplugin.kt57
6 files changed, 0 insertions, 379 deletions
diff --git a/kvision-modules/kvision-compiler-plugin/build.gradle b/kvision-modules/kvision-compiler-plugin/build.gradle
deleted file mode 100644
index 3b00300c..00000000
--- a/kvision-modules/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-modules/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/plugin/CommonComponentRegistrar.kt b/kvision-modules/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/plugin/CommonComponentRegistrar.kt
deleted file mode 100644
index c71dbce8..00000000
--- a/kvision-modules/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/plugin/CommonComponentRegistrar.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.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
-import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
-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(
- project: MockProject,
- configuration: CompilerConfiguration
- ) {
- val processor = KVProcessor()
- val mpapt = MpAptProject(processor, configuration)
- StorageComponentContainerContributor.registerExtension(project, mpapt)
- ClassBuilderInterceptorExtension.registerExtension(project, mpapt)
- JsSyntheticTranslateExtension.registerExtension(project, mpapt)
-
- }
-}
diff --git a/kvision-modules/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/plugin/KVProcessor.kt b/kvision-modules/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/plugin/KVProcessor.kt
deleted file mode 100644
index 1b49a373..00000000
--- a/kvision-modules/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/plugin/KVProcessor.kt
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * 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.plugin
-
-import de.jensklingenberg.mpapt.common.guessingBuildFolder
-import de.jensklingenberg.mpapt.common.methods
-import de.jensklingenberg.mpapt.model.AbstractProcessor
-import de.jensklingenberg.mpapt.model.Element
-import de.jensklingenberg.mpapt.model.RoundEnvironment
-import de.jensklingenberg.mpapt.utils.KotlinPlatformValues
-import org.jetbrains.kotlin.backend.common.descriptors.allParameters
-import org.jetbrains.kotlin.backend.common.descriptors.isSuspend
-import org.jetbrains.kotlin.cli.common.config.kotlinSourceRoots
-import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
-import org.jetbrains.kotlin.descriptors.ParameterDescriptor
-import org.jetbrains.kotlin.js.descriptorUtils.getJetTypeFqName
-import org.jetbrains.kotlin.platform.TargetPlatform
-import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
-import org.jetbrains.kotlin.types.KotlinType
-import pl.treksoft.kvision.annotations.KVService
-import java.io.File
-
-class KVProcessor : AbstractProcessor() {
-
- override fun isTargetPlatformSupported(platform: TargetPlatform): Boolean {
- val targetName = platform.first().platformName
- return when (targetName) {
- KotlinPlatformValues.JS -> false
- KotlinPlatformValues.JVM -> true
- KotlinPlatformValues.NATIVE -> false
- else -> {
- log(targetName)
- false
- }
- }
- }
-
- override fun process(roundEnvironment: RoundEnvironment) {
- val isCommon = this.configuration.kotlinSourceRoots.find { it.isCommon } != null
- if (isCommon) {
- roundEnvironment.getElementsAnnotatedWith(KVService::class.java.name).forEach {
- if (it is Element.ClassElement && it.classDescriptor.name.asString().startsWith("I")
- && it.classDescriptor.name.asString().endsWith("Service")
- ) {
- val cl = it.classDescriptor
- val genRootDir = File(cl.guessingBuildFolder(), "generated-src").apply {
- mkdirs()
- }
- val packageName = cl.containingDeclaration.fqNameSafe.asString()
- val iName = cl.name.asString()
- val baseName = iName.drop(1)
- val commonCode = StringBuilder().apply {
- appendln("//")
- appendln("// GENERATED by KVision")
- appendln("//")
- appendln("package $packageName")
- appendln()
- appendln("import kotlinx.coroutines.CoroutineStart")
- appendln("import kotlinx.coroutines.GlobalScope")
- appendln("import kotlinx.coroutines.launch")
- appendln("import pl.treksoft.kvision.remote.KVServiceManager")
- appendln()
- appendln("expect class $baseName : $iName")
- appendln()
- appendln("object ${baseName}Manager : KVServiceManager<$baseName>($baseName::class) {")
- appendln(" init {")
- appendln(" GlobalScope.launch(start = CoroutineStart.UNDISPATCHED) {")
- cl.methods().forEach {
- appendln(" bind($iName::${it.name})")
- }
- appendln(" }")
- appendln(" }")
- appendln("}")
- }.toString()
- val commonDestinationDir = File(
- genRootDir,
- "common" + File.separator + packageName.replace('.', File.separatorChar)
- ).apply {
- mkdirs()
- }
- val commonFile = File(commonDestinationDir, "${baseName}Manager.kt")
- if (commonFile.exists()) {
- val content = commonFile.readText()
- if (content != commonCode) {
- commonFile.writeText(commonCode)
- }
- } else {
- commonFile.writeText(commonCode)
- }
- val frontendCode = StringBuilder().apply {
- appendln("//")
- appendln("// GENERATED by KVision")
- appendln("//")
- appendln("package $packageName")
- appendln()
- appendln("import pl.treksoft.kvision.remote.KVRemoteAgent")
- getTypes(cl.methods()).sorted().forEach {
- appendln("import $it")
- }
- appendln()
- appendln("actual class $baseName : $iName, KVRemoteAgent<$baseName>(${baseName}Manager) {")
- cl.methods().forEach {
- val name = it.name
- val params = it.allParameters.drop(1)
- val wsMethod =
- if (params.size == 2)
- params.first().type.toString().startsWith("ReceiveChannel")
- else false
- if (it.isSuspend) {
- if (!wsMethod) {
- if (params.isNotEmpty()) {
- appendln(
- " override suspend fun $name(${getParameterList(params)}) = call($iName::$name, ${getParameterNames(
- params
- )})"
- )
- } else {
- appendln(" override suspend fun $name() = call($iName::$name)")
- }
- } else {
- appendln(" override suspend fun $name(${getParameterList(params)}) {}")
- val type1 = params[0].type.toString().replace("ReceiveChannel", "SendChannel")
- val type2 = params[1].type.toString().replace("SendChannel", "ReceiveChannel")
- appendln(" suspend fun $name(handler: suspend ($type1, $type2) -> Unit) = webSocket($iName::$name, handler)")
- }
- } else {
- if (it.returnType.toString().startsWith("RemoteData")) {
- appendln(" override fun $name(${getParameterList(params)}) = ${it.returnType.toString()}()")
- } else {
- appendln(" override fun $name(${getParameterList(params)}) = emptyList<RemoteOption>()")
- }
- }
- }
- appendln("}")
- }.toString()
- val frontendDestinationDir = File(
- genRootDir,
- "frontend" + File.separator + packageName.replace('.', File.separatorChar)
- ).apply {
- mkdirs()
- }
- val frontendFile = File(frontendDestinationDir, "${baseName}.kt")
- if (frontendFile.exists()) {
- val content = frontendFile.readText()
- if (content != frontendCode) {
- frontendFile.writeText(frontendCode)
- }
- } else {
- frontendFile.writeText(frontendCode)
- }
- }
- }
- }
- }
-
- private fun getParameterList(params: List<ParameterDescriptor>): String {
- return params.map {
- "${it.name.asString()}: ${it.type}"
- }.joinToString(", ")
- }
-
- private fun getParameterNames(params: List<ParameterDescriptor>): String {
- return params.map {
- it.name.asString()
- }.joinToString(", ")
- }
-
- private fun getTypes(type: KotlinType): Set<String> {
- return if (type.arguments.isNotEmpty()) {
- (type.arguments.flatMap { getTypes(it.type) } + type.getJetTypeFqName(false)).toSet()
- } else {
- setOf(type.getJetTypeFqName(false))
- }
- }
-
- private fun getTypes(methods: Collection<CallableMemberDescriptor>): Set<String> {
- return methods.flatMap { m ->
- m.allParameters.drop(1).flatMap { p ->
- getTypes(p.type)
- }.toSet() + (m.returnType?.let { getTypes(it) } ?: setOf())
- }.filterNot {
- it.startsWith("kotlin.collections.") || it.startsWith("kotlin.")
- }.toSet()
- }
-
- override fun getSupportedAnnotationTypes(): Set<String> = setOf(
- KVService::class.java.name
- )
-
-}
diff --git a/kvision-modules/kvision-gradle-plugin/build.gradle b/kvision-modules/kvision-gradle-plugin/build.gradle
deleted file mode 100644
index 7b2d0f33..00000000
--- a/kvision-modules/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-modules/kvision-gradle-plugin/src/main/kotlin/pl/treksoft/kvision/gradle/KVisionGradlePlugin.kt b/kvision-modules/kvision-gradle-plugin/src/main/kotlin/pl/treksoft/kvision/gradle/KVisionGradlePlugin.kt
deleted file mode 100644
index ec2dd7f4..00000000
--- a/kvision-modules/kvision-gradle-plugin/src/main/kotlin/pl/treksoft/kvision/gradle/KVisionGradlePlugin.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.gradle
-
-import org.gradle.api.Project
-
-open class KVisionGradlePlugin : org.gradle.api.Plugin<Project> {
- override fun apply(project: Project) {
-
- }
-}
diff --git a/kvision-modules/kvision-gradle-plugin/src/main/kotlin/pl/treksoft/kvision/gradle/KVisionGradleSubplugin.kt b/kvision-modules/kvision-gradle-plugin/src/main/kotlin/pl/treksoft/kvision/gradle/KVisionGradleSubplugin.kt
deleted file mode 100644
index 5ecfc3e9..00000000
--- a/kvision-modules/kvision-gradle-plugin/src/main/kotlin/pl/treksoft/kvision/gradle/KVisionGradleSubplugin.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.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
-import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
-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,
- kotlinCompile: AbstractCompile,
- javaCompile: AbstractCompile?,
- variantData: Any?,
- androidProjectHandler: Any?,
- kotlinCompilation: KotlinCompilation<KotlinCommonOptions>?
- ): List<SubpluginOption> {
- return emptyList()
- }
-
- override fun isApplicable(project: Project, task: AbstractCompile) =
- project.plugins.hasPlugin(KVisionGradlePlugin::class.java)
-
- override fun getCompilerPluginId(): String = "KVisionPlugin"
-
- override fun getPluginArtifact(): SubpluginArtifact = SubpluginArtifact(
- groupId = "pl.treksoft",
- artifactId = "kvision-compiler-plugin",
- version = "2.0.0-SNAPSHOT"
- )
-
-}