+ gradle-plugin-annotations, gradle-plugin-processor libs

build.gradle

@@ -208,6 +208,8 @@ publishingProjects += [
   ":libs-gradle-github",
   ":libs-gradle-docker",
   ":libs-gradle-codegen",
+  ":libs-gradle-plugin-annotations",
+  ":libs-gradle-plugin-processor",
   ":codegen-utils",
   ":codegen-codemodel-dsl",
   ":codegen-mustache-builder",

gradle-composer-plugin/build.gradle

@@ -1,6 +1,17 @@
 apply from: rootProject.file('metainfo.gradle')
 apply from: rootProject.file('readme.gradle')
 
+apply plugin: "kotlin-kapt"
+kapt {
+  generateStubs = true
+  correctErrorTypes = true
+}
+
+// kapt dependencies
+dependencies {
+  kapt project(":libs-gradle-plugin-processor")
+}
+
 task generateComposerPluginConvention(type: TransformTask){
   description "generate meta information class"
 

gradle-composer-plugin/gen/com/satori/gradle/composer/plugin/ComposerPluginConvention.kt

@@ -5,48 +5,52 @@ package com.satori.gradle.composer.plugin
 import org.gradle.api.*
 
 open class ComposerPluginConvention(val project: Project) {
-  val satoriComposerVersion = "0.5.73-SNAPSHOT"
+  val satoriComposerVersion = "0.5.75-SNAPSHOT"
 
-  fun satoriGradleComposerPlugin() = "com.satori:satori-gradle-composer-plugin:0.5.73-SNAPSHOT"
+  fun satoriGradleComposerPlugin() = "com.satori:satori-gradle-composer-plugin:0.5.75-SNAPSHOT"
 
-  fun satoriComposer() = "com.satori:satori-composer:0.5.73-SNAPSHOT"
+  fun satoriComposer() = "com.satori:satori-composer:0.5.75-SNAPSHOT"
 
-  fun satoriMods() = "com.satori:satori-mods:0.5.73-SNAPSHOT"
+  fun satoriMods() = "com.satori:satori-mods:0.5.75-SNAPSHOT"
 
-  fun satoriModsSuite() = "com.satori:satori-mods-suite:0.5.73-SNAPSHOT"
+  fun satoriModsSuite() = "com.satori:satori-mods-suite:0.5.75-SNAPSHOT"
 
-  fun satoriLibsAsyncApi() = "com.satori:satori-libs-async-api:0.5.73-SNAPSHOT"
+  fun satoriLibsAsyncApi() = "com.satori:satori-libs-async-api:0.5.75-SNAPSHOT"
 
-  fun satoriLibsAsyncCore() = "com.satori:satori-libs-async-core:0.5.73-SNAPSHOT"
+  fun satoriLibsAsyncCore() = "com.satori:satori-libs-async-core:0.5.75-SNAPSHOT"
 
-  fun satoriLibsAsyncKotlin() = "com.satori:satori-libs-async-kotlin:0.5.73-SNAPSHOT"
+  fun satoriLibsAsyncKotlin() = "com.satori:satori-libs-async-kotlin:0.5.75-SNAPSHOT"
 
-  fun satoriLibsCommonKotlin() = "com.satori:satori-libs-common-kotlin:0.5.73-SNAPSHOT"
+  fun satoriLibsCommonKotlin() = "com.satori:satori-libs-common-kotlin:0.5.75-SNAPSHOT"
 
-  fun satoriLibsVertxKotlin() = "com.satori:satori-libs-vertx-kotlin:0.5.73-SNAPSHOT"
+  fun satoriLibsVertxKotlin() = "com.satori:satori-libs-vertx-kotlin:0.5.75-SNAPSHOT"
 
-  fun satoriLibsGtfs() = "com.satori:satori-libs-gtfs:0.5.73-SNAPSHOT"
+  fun satoriLibsGtfs() = "com.satori:satori-libs-gtfs:0.5.75-SNAPSHOT"
 
-  fun satoriLibsCompositionDrawer() = "com.satori:satori-libs-composition-drawer:0.5.73-SNAPSHOT"
+  fun satoriLibsCompositionDrawer() = "com.satori:satori-libs-composition-drawer:0.5.75-SNAPSHOT"
 
-  fun satoriLibsTestlib() = "com.satori:satori-libs-testlib:0.5.73-SNAPSHOT"
+  fun satoriLibsTestlib() = "com.satori:satori-libs-testlib:0.5.75-SNAPSHOT"
 
-  fun satoriLibsGradleUtils() = "com.satori:satori-libs-gradle-utils:0.5.73-SNAPSHOT"
+  fun satoriLibsGradleUtils() = "com.satori:satori-libs-gradle-utils:0.5.75-SNAPSHOT"
 
-  fun satoriLibsGradleTransform() = "com.satori:satori-libs-gradle-transform:0.5.73-SNAPSHOT"
+  fun satoriLibsGradleTransform() = "com.satori:satori-libs-gradle-transform:0.5.75-SNAPSHOT"
 
-  fun satoriLibsGradleGithub() = "com.satori:satori-libs-gradle-github:0.5.73-SNAPSHOT"
+  fun satoriLibsGradleGithub() = "com.satori:satori-libs-gradle-github:0.5.75-SNAPSHOT"
 
-  fun satoriLibsGradleDocker() = "com.satori:satori-libs-gradle-docker:0.5.73-SNAPSHOT"
+  fun satoriLibsGradleDocker() = "com.satori:satori-libs-gradle-docker:0.5.75-SNAPSHOT"
 
-  fun satoriLibsGradleCodegen() = "com.satori:satori-libs-gradle-codegen:0.5.73-SNAPSHOT"
+  fun satoriLibsGradleCodegen() = "com.satori:satori-libs-gradle-codegen:0.5.75-SNAPSHOT"
 
-  fun satoriCodegenUtils() = "com.satori:satori-codegen-utils:0.5.73-SNAPSHOT"
+  fun satoriLibsGradlePluginAnnotations() = "com.satori:satori-libs-gradle-plugin-annotations:0.5.75-SNAPSHOT"
 
-  fun satoriCodegenCodemodelDsl() = "com.satori:satori-codegen-codemodel-dsl:0.5.73-SNAPSHOT"
+  fun satoriLibsGradlePluginProcessor() = "com.satori:satori-libs-gradle-plugin-processor:0.5.75-SNAPSHOT"
 
-  fun satoriCodegenMustacheBuilder() = "com.satori:satori-codegen-mustache-builder:0.5.73-SNAPSHOT"
+  fun satoriCodegenUtils() = "com.satori:satori-codegen-utils:0.5.75-SNAPSHOT"
 
-  fun satoriCodegenYamlFileMerger() = "com.satori:satori-codegen-yaml-file-merger:0.5.73-SNAPSHOT"
+  fun satoriCodegenCodemodelDsl() = "com.satori:satori-codegen-codemodel-dsl:0.5.75-SNAPSHOT"
+
+  fun satoriCodegenMustacheBuilder() = "com.satori:satori-codegen-mustache-builder:0.5.75-SNAPSHOT"
+
+  fun satoriCodegenYamlFileMerger() = "com.satori:satori-codegen-yaml-file-merger:0.5.75-SNAPSHOT"
 
 }

gradle-composer-plugin/readme.md

@@ -1,4 +1,4 @@
-[![Maven](https://img.shields.io/nexus/s/https/oss.sonatype.org/com.satori/satori-gradle-composer-plugin.svg)](https://oss.sonatype.org/content/repositories/snapshots/com/satori/satori-gradle-composer-plugin/0.5.73-SNAPSHOT/)
+[![Maven](https://img.shields.io/nexus/s/https/oss.sonatype.org/com.satori/satori-gradle-composer-plugin.svg)](https://oss.sonatype.org/content/repositories/snapshots/com/satori/satori-gradle-composer-plugin/0.5.75-SNAPSHOT/)
 
 ## Comoser Gradle plugin 
 
@@ -13,7 +13,7 @@ buildscript{
     maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
   }
   dependencies {
-    classpath "com.satori:satori-gradle-composer-plugin:0.5.73-SNAPSHOT"
+    classpath "com.satori:satori-gradle-composer-plugin:0.5.75-SNAPSHOT"
   }
 }
 apply plugin: "com.satori.composer"
@@ -22,47 +22,51 @@ apply plugin: "com.satori.composer"
 ### project extensions
 
 
-- `satoriGradleComposerPlugin()` - returns `"com.satori:satori-gradle-composer-plugin:0.5.73-SNAPSHOT"`
+- `satoriGradleComposerPlugin()` - returns `"com.satori:satori-gradle-composer-plugin:0.5.75-SNAPSHOT"`
 
-- `satoriComposer()` - returns `"com.satori:satori-composer:0.5.73-SNAPSHOT"`
+- `satoriComposer()` - returns `"com.satori:satori-composer:0.5.75-SNAPSHOT"`
 
-- `satoriMods()` - returns `"com.satori:satori-mods:0.5.73-SNAPSHOT"`
+- `satoriMods()` - returns `"com.satori:satori-mods:0.5.75-SNAPSHOT"`
 
-- `satoriModsSuite()` - returns `"com.satori:satori-mods-suite:0.5.73-SNAPSHOT"`
+- `satoriModsSuite()` - returns `"com.satori:satori-mods-suite:0.5.75-SNAPSHOT"`
 
-- `satoriLibsAsyncApi()` - returns `"com.satori:satori-libs-async-api:0.5.73-SNAPSHOT"`
+- `satoriLibsAsyncApi()` - returns `"com.satori:satori-libs-async-api:0.5.75-SNAPSHOT"`
 
-- `satoriLibsAsyncCore()` - returns `"com.satori:satori-libs-async-core:0.5.73-SNAPSHOT"`
+- `satoriLibsAsyncCore()` - returns `"com.satori:satori-libs-async-core:0.5.75-SNAPSHOT"`
 
-- `satoriLibsAsyncKotlin()` - returns `"com.satori:satori-libs-async-kotlin:0.5.73-SNAPSHOT"`
+- `satoriLibsAsyncKotlin()` - returns `"com.satori:satori-libs-async-kotlin:0.5.75-SNAPSHOT"`
 
-- `satoriLibsCommonKotlin()` - returns `"com.satori:satori-libs-common-kotlin:0.5.73-SNAPSHOT"`
+- `satoriLibsCommonKotlin()` - returns `"com.satori:satori-libs-common-kotlin:0.5.75-SNAPSHOT"`
 
-- `satoriLibsVertxKotlin()` - returns `"com.satori:satori-libs-vertx-kotlin:0.5.73-SNAPSHOT"`
+- `satoriLibsVertxKotlin()` - returns `"com.satori:satori-libs-vertx-kotlin:0.5.75-SNAPSHOT"`
 
-- `satoriLibsGtfs()` - returns `"com.satori:satori-libs-gtfs:0.5.73-SNAPSHOT"`
+- `satoriLibsGtfs()` - returns `"com.satori:satori-libs-gtfs:0.5.75-SNAPSHOT"`
 
-- `satoriLibsCompositionDrawer()` - returns `"com.satori:satori-libs-composition-drawer:0.5.73-SNAPSHOT"`
+- `satoriLibsCompositionDrawer()` - returns `"com.satori:satori-libs-composition-drawer:0.5.75-SNAPSHOT"`
 
-- `satoriLibsTestlib()` - returns `"com.satori:satori-libs-testlib:0.5.73-SNAPSHOT"`
+- `satoriLibsTestlib()` - returns `"com.satori:satori-libs-testlib:0.5.75-SNAPSHOT"`
 
-- `satoriLibsGradleUtils()` - returns `"com.satori:satori-libs-gradle-utils:0.5.73-SNAPSHOT"`
+- `satoriLibsGradleUtils()` - returns `"com.satori:satori-libs-gradle-utils:0.5.75-SNAPSHOT"`
 
-- `satoriLibsGradleTransform()` - returns `"com.satori:satori-libs-gradle-transform:0.5.73-SNAPSHOT"`
+- `satoriLibsGradleTransform()` - returns `"com.satori:satori-libs-gradle-transform:0.5.75-SNAPSHOT"`
 
-- `satoriLibsGradleGithub()` - returns `"com.satori:satori-libs-gradle-github:0.5.73-SNAPSHOT"`
+- `satoriLibsGradleGithub()` - returns `"com.satori:satori-libs-gradle-github:0.5.75-SNAPSHOT"`
 
-- `satoriLibsGradleDocker()` - returns `"com.satori:satori-libs-gradle-docker:0.5.73-SNAPSHOT"`
+- `satoriLibsGradleDocker()` - returns `"com.satori:satori-libs-gradle-docker:0.5.75-SNAPSHOT"`
 
-- `satoriLibsGradleCodegen()` - returns `"com.satori:satori-libs-gradle-codegen:0.5.73-SNAPSHOT"`
+- `satoriLibsGradleCodegen()` - returns `"com.satori:satori-libs-gradle-codegen:0.5.75-SNAPSHOT"`
 
-- `satoriCodegenUtils()` - returns `"com.satori:satori-codegen-utils:0.5.73-SNAPSHOT"`
+- `satoriLibsGradlePluginAnnotations()` - returns `"com.satori:satori-libs-gradle-plugin-annotations:0.5.75-SNAPSHOT"`
 
-- `satoriCodegenCodemodelDsl()` - returns `"com.satori:satori-codegen-codemodel-dsl:0.5.73-SNAPSHOT"`
+- `satoriLibsGradlePluginProcessor()` - returns `"com.satori:satori-libs-gradle-plugin-processor:0.5.75-SNAPSHOT"`
 
-- `satoriCodegenMustacheBuilder()` - returns `"com.satori:satori-codegen-mustache-builder:0.5.73-SNAPSHOT"`
+- `satoriCodegenUtils()` - returns `"com.satori:satori-codegen-utils:0.5.75-SNAPSHOT"`
 
-- `satoriCodegenYamlFileMerger()` - returns `"com.satori:satori-codegen-yaml-file-merger:0.5.73-SNAPSHOT"`
+- `satoriCodegenCodemodelDsl()` - returns `"com.satori:satori-codegen-codemodel-dsl:0.5.75-SNAPSHOT"`
+
+- `satoriCodegenMustacheBuilder()` - returns `"com.satori:satori-codegen-mustache-builder:0.5.75-SNAPSHOT"`
+
+- `satoriCodegenYamlFileMerger()` - returns `"com.satori:satori-codegen-yaml-file-merger:0.5.75-SNAPSHOT"`
 
 
 
@@ -76,6 +80,6 @@ apply plugin: "com.satori.composer"
 <dependency>
     <groupId>com.satori</groupId>
     <artifactId>satori-gradle-composer-plugin</artifactId>
-    <version>0.5.73-SNAPSHOT</version>
+    <version>0.5.75-SNAPSHOT</version>
 </dependency>
 ```

gradle.properties

@@ -1,7 +1,7 @@
 group=com.satori
-version=0.5.73-SNAPSHOT
+version=0.5.75-SNAPSHOT
 
-scaffoldingVersion=0.5.72-SNAPSHOT
+scaffoldingVersion=0.5.74-SNAPSHOT
 
 #nexusUsername=
 #nexusPassword=
@@ -14,7 +14,7 @@ slf4jVersion=1.7.25
 jacksonVersion=2.9.4
 vertxVersion=3.5.1
 junitVersion=4.+
-kotlinVersion=1.2.31
+kotlinVersion=1.2.41
 kotlinCoroutinesVersion=0.22.5
 logbackVersion=1.2.3
 groovyVersion=2.4.14

libs/composition-drawer/build.gradle

@@ -1,6 +1,17 @@
 apply from: rootProject.file('metainfo.gradle')
 apply from: rootProject.file('readme.gradle')
 
+apply plugin: "kotlin-kapt"
+kapt {
+  generateStubs = true
+  correctErrorTypes = true
+}
+
+// kapt dependencies
+dependencies {
+  kapt project(":libs-gradle-plugin-processor")
+}
+
 // main dependencies
 dependencies {
   compile project(":composer")
@@ -18,6 +29,8 @@ dependencies {
   compile "org.codehaus.groovy:groovy-all:$groovyVersion"
 
   compile gradleApi()
+
+  compileOnly project(":libs-gradle-plugin-annotations")
 }
 
 // test dependencies

libs/composition-drawer/readme.md

@@ -20,7 +20,7 @@ buildscript{
     maven {url "https://oss.sonatype.org/content/repositories/snapshots"}
   }
   dependencies {
-    classpath "com.satori:satori-libs-composition-drawer:0.5.73-SNAPSHOT"
+    classpath "com.satori:satori-libs-composition-drawer:0.5.75-SNAPSHOT"
   }
 }
 apply plugin: "com.satori.composition.drawer"
@@ -43,7 +43,7 @@ buildscript{
     maven { url "https://oss.sonatype.org/content/repositories/snapshots"}
   }
   dependencies {
-    classpath "com.satori:satori-libs-composition-drawer:0.5.73-SNAPSHOT"
+    classpath "com.satori:satori-libs-composition-drawer:0.5.75-SNAPSHOT"
   }
 }
 
@@ -72,7 +72,7 @@ repositories {
   
 configurations{compositionDrawer}
 dependencies {
-  compositionDrawer "com.satori:satori-libs-composition-drawer:0.5.73-SNAPSHOT"
+  compositionDrawer "com.satori:satori-libs-composition-drawer:0.5.75-SNAPSHOT"
 }
 
 task generateCompositionDiagram(type: JavaExec) {
@@ -110,13 +110,13 @@ task generateCompositionDiagram(type: JavaExec) {
 <dependency>
     <groupId>com.satori</groupId>
     <artifactId>satori-libs-composition-drawer</artifactId>
-    <version>0.5.73-SNAPSHOT</version>
+    <version>0.5.75-SNAPSHOT</version>
 </dependency>
 ```
 
 
 ### Download
-[satori-libs-composition-drawer.v0.5.73-SNAPSHOT.zip](https://github.com/satori-com/satori-composer/releases/download/v0.5.73-SNAPSHOT/satori-libs-composition-drawer.v0.5.73-SNAPSHOT.zip)<br/>
+[satori-libs-composition-drawer.v0.5.75-SNAPSHOT.zip](https://github.com/satori-com/satori-composer/releases/download/v0.5.75-SNAPSHOT/satori-libs-composition-drawer.v0.5.75-SNAPSHOT.zip)<br/>
 [or see latest releases](https://github.com/satori-com/satori-composer/releases/latest)
 
 ### Example of generated diagram

libs/composition-drawer/src/com/satori/libs/composition/drawer/CompositionDrawerPlugin.kt

@@ -1,8 +1,10 @@
 package com.satori.libs.composition.drawer
 
+import com.satori.libs.gradle.plugin.annotations.*
 import com.satori.libs.gradle.utils.*
 import org.gradle.api.*
 
+@GradlePlugin("com.satori.composition.drawer")
 open class CompositionDrawerPlugin : Plugin<Project> {
 
   override fun apply(project: Project) {

libs/gradle/codegen/build.gradle

@@ -1,6 +1,17 @@
 apply from: rootProject.file('readme.gradle')
 apply from: rootProject.file('metainfo.gradle')
 
+apply plugin: "kotlin-kapt"
+kapt {
+  generateStubs = true
+  correctErrorTypes = true
+}
+
+// kapt dependencies
+dependencies {
+  kapt project(":libs-gradle-plugin-processor")
+}
+
 model {
   tasks.testPreapare {
     dependsOn tasks.publishJarPublicationToMavenLocal
@@ -15,6 +26,8 @@ dependencies {
   compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesVersion"
 
   compile gradleApi()
+
+  compileOnly project(":libs-gradle-plugin-annotations")
 }
 
 // test dependencies

libs/gradle/codegen/readme.md

@@ -1,4 +1,4 @@
-[![Maven](https://img.shields.io/nexus/s/https/oss.sonatype.org/com.satori/satori-libs-gradle-codegen.svg)](https://oss.sonatype.org/content/repositories/snapshots/com/satori/satori-libs-gradle-codegen/0.5.73-SNAPSHOT/)
+[![Maven](https://img.shields.io/nexus/s/https/oss.sonatype.org/com.satori/satori-libs-gradle-codegen.svg)](https://oss.sonatype.org/content/repositories/snapshots/com/satori/satori-libs-gradle-codegen/0.5.75-SNAPSHOT/)
 
 ## 'codegen' gradle plugin 
 
@@ -13,7 +13,7 @@ buildscript{
     maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
   }
   dependencies {
-    classpath "com.satori:satori-libs-gradle-codegen:0.5.73-SNAPSHOT"
+    classpath "com.satori:satori-libs-gradle-codegen:0.5.75-SNAPSHOT"
   }
 }
 apply plugin: "com.satori.codegen"
@@ -128,6 +128,6 @@ codeFormatter.camel(project.name)
 <dependency>
     <groupId>com.satori</groupId>
     <artifactId>satori-libs-gradle-codegen</artifactId>
-    <version>0.5.73-SNAPSHOT</version>
+    <version>0.5.75-SNAPSHOT</version>
 </dependency>
 ```

libs/gradle/codegen/src/com/satori/libs/gradle/codegen/CodeGenPlugin.kt

@@ -1,7 +1,9 @@
 package com.satori.libs.gradle.codegen
 
+import com.satori.libs.gradle.plugin.annotations.*
 import org.gradle.api.*
 
+@GradlePlugin("com.satori.codegen")
 open class CodeGenPlugin : Plugin<Project> {
   override fun apply(project: Project) {
     val conv = CodeGenPluginConvention(project)

libs/gradle/docker/build.gradle

@@ -1,5 +1,15 @@
 apply from: rootProject.file('readme.gradle')
 apply from: rootProject.file('metainfo.gradle')
+apply plugin: "kotlin-kapt"
+kapt {
+  generateStubs = true
+  correctErrorTypes = true
+}
+
+// kapt dependencies
+dependencies {
+  kapt project(":libs-gradle-plugin-processor")
+}
 
 model {
   tasks.testPreapare {
@@ -15,6 +25,8 @@ dependencies {
   compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesVersion"
 
   compile gradleApi()
+
+  compileOnly project(":libs-gradle-plugin-annotations")
 }
 
 // test dependencies