diff options
-rw-r--r-- | build.gradle | 4 | ||||
-rw-r--r-- | kvision-tools/kvision-compiler-plugin/build.gradle (renamed from kvision-modules/kvision-compiler-plugin/build.gradle) | 0 | ||||
-rw-r--r-- | kvision-tools/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/plugin/CommonComponentRegistrar.kt (renamed from kvision-modules/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/plugin/CommonComponentRegistrar.kt) | 0 | ||||
-rw-r--r-- | kvision-tools/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/plugin/KVProcessor.kt (renamed from kvision-modules/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/plugin/KVProcessor.kt) | 2 | ||||
-rw-r--r-- | kvision-tools/kvision-gradle-plugin/build.gradle (renamed from kvision-modules/kvision-gradle-plugin/build.gradle) | 0 | ||||
-rw-r--r-- | kvision-tools/kvision-gradle-plugin/src/main/kotlin/pl/treksoft/kvision/gradle/KVisionGradlePlugin.kt (renamed from kvision-modules/kvision-gradle-plugin/src/main/kotlin/pl/treksoft/kvision/gradle/KVisionGradlePlugin.kt) | 0 | ||||
-rw-r--r-- | kvision-tools/kvision-gradle-plugin/src/main/kotlin/pl/treksoft/kvision/gradle/KVisionGradleSubplugin.kt (renamed from kvision-modules/kvision-gradle-plugin/src/main/kotlin/pl/treksoft/kvision/gradle/KVisionGradleSubplugin.kt) | 0 | ||||
-rw-r--r-- | settings.gradle | 4 |
8 files changed, 5 insertions, 5 deletions
diff --git a/build.gradle b/build.gradle index 35e0e7ab..63d2fbee 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id "io.gitlab.arturbosch.detekt" version "1.0.0-RC14" } -configure(allprojects - project(':kvision-modules')) { +configure(allprojects - project(':kvision-modules') - project(':kvision-tools')) { repositories { jcenter() mavenCentral() @@ -36,7 +36,7 @@ configure(allprojects - project(':kvision-modules')) { } } -configure(allprojects - project(':kvision-modules') - project(":kvision-modules:kvision-base")) { +configure(allprojects - project(':kvision-modules') - project(':kvision-tools') - project(":kvision-modules:kvision-base")) { apply plugin: 'io.gitlab.arturbosch.detekt' apply plugin: 'com.jfrog.bintray' apply plugin: 'maven' diff --git a/kvision-modules/kvision-compiler-plugin/build.gradle b/kvision-tools/kvision-compiler-plugin/build.gradle index 3b00300c..3b00300c 100644 --- a/kvision-modules/kvision-compiler-plugin/build.gradle +++ b/kvision-tools/kvision-compiler-plugin/build.gradle diff --git a/kvision-modules/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..c71dbce8 100644 --- a/kvision-modules/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 diff --git a/kvision-modules/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/plugin/KVProcessor.kt b/kvision-tools/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/plugin/KVProcessor.kt index 1b49a373..0e62b959 100644 --- a/kvision-modules/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/plugin/KVProcessor.kt +++ b/kvision-tools/kvision-compiler-plugin/src/main/kotlin/pl/treksoft/kvision/plugin/KVProcessor.kt @@ -55,7 +55,7 @@ class KVProcessor : AbstractProcessor() { } override fun process(roundEnvironment: RoundEnvironment) { - val isCommon = this.configuration.kotlinSourceRoots.find { it.isCommon } != null + 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") diff --git a/kvision-modules/kvision-gradle-plugin/build.gradle b/kvision-tools/kvision-gradle-plugin/build.gradle index 7b2d0f33..7b2d0f33 100644 --- a/kvision-modules/kvision-gradle-plugin/build.gradle +++ b/kvision-tools/kvision-gradle-plugin/build.gradle diff --git a/kvision-modules/kvision-gradle-plugin/src/main/kotlin/pl/treksoft/kvision/gradle/KVisionGradlePlugin.kt b/kvision-tools/kvision-gradle-plugin/src/main/kotlin/pl/treksoft/kvision/gradle/KVisionGradlePlugin.kt index ec2dd7f4..ec2dd7f4 100644 --- a/kvision-modules/kvision-gradle-plugin/src/main/kotlin/pl/treksoft/kvision/gradle/KVisionGradlePlugin.kt +++ b/kvision-tools/kvision-gradle-plugin/src/main/kotlin/pl/treksoft/kvision/gradle/KVisionGradlePlugin.kt diff --git a/kvision-modules/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 5ecfc3e9..5ecfc3e9 100644 --- a/kvision-modules/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 diff --git a/settings.gradle b/settings.gradle index 08b7370d..2e1586e4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -31,5 +31,5 @@ include 'kvision-modules:kvision-base', 'kvision-modules:kvision-electron', 'kvision-modules:kvision-cordova', 'kvision-modules:kvision-testutils', - 'kvision-modules:kvision-compiler-plugin', - 'kvision-modules:kvision-gradle-plugin' + 'kvision-tools:kvision-compiler-plugin', + 'kvision-tools:kvision-gradle-plugin' |