From 83e4c7a736bd566e469bda9bcb2609bfecc56d55 Mon Sep 17 00:00:00 2001 From: akolomentsev Date: Fri, 20 Apr 2018 12:55:46 -0700 Subject: [PATCH] gradle-codegen lib: SourceSetExecTask::forSourceSet automatically adds dependency on specified source set --- gradle.properties | 4 ++-- libs/composition-drawer/readme.md | 10 +++++----- libs/gradle/codegen/readme.md | 6 +++--- .../satori/libs/gradle/codegen/SourceSetExecTask.kt | 1 + libs/gradle/docker/readme.md | 6 +++--- libs/gradle/github/readme.md | 6 +++--- libs/gradle/transform/readme.md | 6 +++--- libs/gtfs/readme.md | 4 ++-- readme.md | 4 ++-- 9 files changed, 24 insertions(+), 23 deletions(-) diff --git a/gradle.properties b/gradle.properties index 06663fe..e454da0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group=com.satori -version=0.5.63-SNAPSHOT +version=0.5.64-SNAPSHOT -scaffoldingVersion=0.5.61-SNAPSHOT +scaffoldingVersion=0.5.63-SNAPSHOT #nexusUsername= #nexusPassword= diff --git a/libs/composition-drawer/readme.md b/libs/composition-drawer/readme.md index 29191b1..2664028 100644 --- a/libs/composition-drawer/readme.md +++ b/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.63-SNAPSHOT" + classpath "com.satori:satori-libs-composition-drawer:0.5.64-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.63-SNAPSHOT" + classpath "com.satori:satori-libs-composition-drawer:0.5.64-SNAPSHOT" } } @@ -72,7 +72,7 @@ repositories { configurations{compositionDrawer} dependencies { - compositionDrawer "com.satori:satori-libs-composition-drawer:0.5.63-SNAPSHOT" + compositionDrawer "com.satori:satori-libs-composition-drawer:0.5.64-SNAPSHOT" } task generateCompositionDiagram(type: JavaExec) { @@ -110,13 +110,13 @@ task generateCompositionDiagram(type: JavaExec) { com.satori satori-libs-composition-drawer - 0.5.63-SNAPSHOT + 0.5.64-SNAPSHOT ``` ### Download -[satori-libs-composition-drawer.v0.5.63-SNAPSHOT.zip](https://github.com/satori-com/satori-composer/releases/download/v0.5.63-SNAPSHOT/satori-libs-composition-drawer.v0.5.63-SNAPSHOT.zip)
+[satori-libs-composition-drawer.v0.5.64-SNAPSHOT.zip](https://github.com/satori-com/satori-composer/releases/download/v0.5.64-SNAPSHOT/satori-libs-composition-drawer.v0.5.64-SNAPSHOT.zip)
[or see latest releases](https://github.com/satori-com/satori-composer/releases/latest) ### Example of generated diagram diff --git a/libs/gradle/codegen/readme.md b/libs/gradle/codegen/readme.md index f43b1cd..281389a 100644 --- a/libs/gradle/codegen/readme.md +++ b/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.63-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.64-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.63-SNAPSHOT" + classpath "com.satori:satori-libs-gradle-codegen:0.5.64-SNAPSHOT" } } apply plugin: "com.satori.codegen" @@ -122,6 +122,6 @@ task generateGraphqlClasses { com.satori satori-libs-gradle-codegen - 0.5.63-SNAPSHOT + 0.5.64-SNAPSHOT ``` diff --git a/libs/gradle/codegen/src/com/satori/libs/gradle/codegen/SourceSetExecTask.kt b/libs/gradle/codegen/src/com/satori/libs/gradle/codegen/SourceSetExecTask.kt index 033da07..ccc4e7d 100644 --- a/libs/gradle/codegen/src/com/satori/libs/gradle/codegen/SourceSetExecTask.kt +++ b/libs/gradle/codegen/src/com/satori/libs/gradle/codegen/SourceSetExecTask.kt @@ -17,6 +17,7 @@ open class SourceSetExecTask : JavaExec() { } fun forSourceSet(forSourceSet: SourceSet) { + dependsOn(project.tasks.getByName(forSourceSet.classesTaskName)) classpath = forSourceSet.runtimeClasspath } diff --git a/libs/gradle/docker/readme.md b/libs/gradle/docker/readme.md index 6282fa2..038e781 100644 --- a/libs/gradle/docker/readme.md +++ b/libs/gradle/docker/readme.md @@ -1,4 +1,4 @@ -[![Maven](https://img.shields.io/nexus/s/https/oss.sonatype.org/com.satori/satori-libs-gradle-docker.svg)](https://oss.sonatype.org/content/repositories/snapshots/com/satori/satori-libs-gradle-docker/0.5.63-SNAPSHOT/) +[![Maven](https://img.shields.io/nexus/s/https/oss.sonatype.org/com.satori/satori-libs-gradle-docker.svg)](https://oss.sonatype.org/content/repositories/snapshots/com/satori/satori-libs-gradle-docker/0.5.64-SNAPSHOT/) ## Gradle plugin 'com.satori.transform' @@ -14,7 +14,7 @@ buildscript{ maven { url "https://oss.sonatype.org/content/repositories/snapshots" } } dependencies { - classpath "com.satori:satori-libs-gradle-docker:0.5.63-SNAPSHOT" + classpath "com.satori:satori-libs-gradle-docker:0.5.64-SNAPSHOT" } } apply plugin: "com.satori.docker" @@ -146,6 +146,6 @@ stop docker container com.satori satori-libs-gradle-docker - 0.5.63-SNAPSHOT + 0.5.64-SNAPSHOT ``` diff --git a/libs/gradle/github/readme.md b/libs/gradle/github/readme.md index 4752b4c..7927e90 100644 --- a/libs/gradle/github/readme.md +++ b/libs/gradle/github/readme.md @@ -1,4 +1,4 @@ -[![Maven](https://img.shields.io/nexus/s/https/oss.sonatype.org/com.satori/satori-libs-gradle-github.svg)](https://oss.sonatype.org/content/repositories/snapshots/com/satori/satori-libs-gradle-github/0.5.63-SNAPSHOT/) +[![Maven](https://img.shields.io/nexus/s/https/oss.sonatype.org/com.satori/satori-libs-gradle-github.svg)](https://oss.sonatype.org/content/repositories/snapshots/com/satori/satori-libs-gradle-github/0.5.64-SNAPSHOT/) ## 'github' gradle plugin tasks for management github releases using [Github Releases API v3](https://developer.github.com/v3/repos/releases/) @@ -10,7 +10,7 @@ buildscript{ maven { url "https://oss.sonatype.org/content/repositories/snapshots" } } dependencies { - classpath "com.satori:satori-libs-gradle-github:0.5.63-SNAPSHOT" + classpath "com.satori:satori-libs-gradle-github:0.5.64-SNAPSHOT" } } apply plugin: "com.satori.github" @@ -43,6 +43,6 @@ task githubPublishRelease(type: GitHubPublishReleaseTask) { com.satori satori-libs-gradle-github - 0.5.63-SNAPSHOT + 0.5.64-SNAPSHOT ``` diff --git a/libs/gradle/transform/readme.md b/libs/gradle/transform/readme.md index 6fc564e..dedd1ab 100644 --- a/libs/gradle/transform/readme.md +++ b/libs/gradle/transform/readme.md @@ -1,4 +1,4 @@ -[![Maven](https://img.shields.io/nexus/s/https/oss.sonatype.org/com.satori/satori-libs-gradle-transform.svg)](https://oss.sonatype.org/content/repositories/snapshots/com/satori/satori-libs-gradle-transform/0.5.63-SNAPSHOT/) +[![Maven](https://img.shields.io/nexus/s/https/oss.sonatype.org/com.satori/satori-libs-gradle-transform.svg)](https://oss.sonatype.org/content/repositories/snapshots/com/satori/satori-libs-gradle-transform/0.5.64-SNAPSHOT/) ## Gradle plugin 'com.satori.transform' gradle task wrappers around groovy [GStringTemplateEngine](http://docs.groovy-lang.org/next/html/documentation/template-engines.html#_gstringtemplateengine) @@ -12,7 +12,7 @@ buildscript{ maven { url "https://oss.sonatype.org/content/repositories/snapshots" } } dependencies { - classpath "com.satori:satori-libs-gradle-docker:0.5.63-SNAPSHOT" + classpath "com.satori:satori-libs-gradle-docker:0.5.64-SNAPSHOT" } } apply plugin: "com.satori.docker" @@ -59,6 +59,6 @@ task generateReadme { com.satori satori-libs-gradle-transform - 0.5.63-SNAPSHOT + 0.5.64-SNAPSHOT ``` diff --git a/libs/gtfs/readme.md b/libs/gtfs/readme.md index 6231545..b437855 100644 --- a/libs/gtfs/readme.md +++ b/libs/gtfs/readme.md @@ -14,13 +14,13 @@ classes are generated based on [gtfs-realtime.proto](https://developers.google.c com.satori satori-libs-gtfs - 0.5.63-SNAPSHOT + 0.5.64-SNAPSHOT ``` ### Download -[satori-libs-gtfs.v0.5.63-SNAPSHOT.zip](https://github.com/satori-com/satori-composer/releases/download/v0.5.63-SNAPSHOT/satori-libs-gtfs.v0.5.63-SNAPSHOT.zip)
+[satori-libs-gtfs.v0.5.64-SNAPSHOT.zip](https://github.com/satori-com/satori-composer/releases/download/v0.5.64-SNAPSHOT/satori-libs-gtfs.v0.5.64-SNAPSHOT.zip)
[or see latest releases](https://github.com/satori-com/satori-composer/releases/latest) ### Examples diff --git a/readme.md b/readme.md index 7603f1a..7167c43 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ ## Satori Composer (preview) [![Build Status](https://travis-ci.org/satori-com/satori-composer.svg?branch=dev)](https://travis-ci.org/satori-com/satori-composer) -[![Maven](https://img.shields.io/nexus/s/https/oss.sonatype.org/com.satori/satori-composer.svg)](https://oss.sonatype.org/content/repositories/snapshots/com/satori/satori-composer/0.5.63-SNAPSHOT/) +[![Maven](https://img.shields.io/nexus/s/https/oss.sonatype.org/com.satori/satori-composer.svg)](https://oss.sonatype.org/content/repositories/snapshots/com/satori/satori-composer/0.5.64-SNAPSHOT/) #### Example ![diagram](mods-examples/big-blue-bus/docs/files/diagram.png) @@ -99,7 +99,7 @@ com.satori satori-composer - 0.5.63-SNAPSHOT + 0.5.64-SNAPSHOT ```