Skip to content

Commit

Permalink
Make proto extract tasks depend on the configuration.
Browse files Browse the repository at this point in the history
If the configuration has a dependency on a project, the project must be
built to create the jar prior to the extract task. The depended project
is not guaranteed to be built before the task, unless the task
explicitly depends on the configuration.

Bump the version to 0.6.1
  • Loading branch information
zhangkun83 committed Jul 30, 2015
1 parent 01808d5 commit 1d6e1ec
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ For more information about the Protobuf Compiler, please refer to
[Google Developers Site](https://developers.google.com/protocol-buffers/docs/reference/java-generated?csw=1).

## Latest Version
The latest version is ``0.6.0``. It is available on Maven Central. To add
The latest version is ``0.6.1``. It is available on Maven Central. To add
dependency to it:
```gradle
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.6.0'
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.6.1'
}
}
```
Expand All @@ -33,7 +33,7 @@ buildscript {
}
}
dependencies {
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.6.0-SNAPSHOT'
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.6.2-SNAPSHOT'
}
}
```
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ apply plugin: "com.gradle.plugin-publish"
apply plugin: 'signing'

group = 'com.google.protobuf'
version = '0.6.0'
version = '0.6.1'

ext.isReleaseVersion = !version.endsWith("SNAPSHOT")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,7 @@ class ProtobufPlugin implements Plugin<Project> {
description = "Extracts proto files/dependencies specified by 'protobuf' configuration"
destDir = getExtractedProtosDir(sourceSetName) as File
configName = Utils.getConfigName(sourceSetName, 'protobuf')
dependsOn project.configurations.getByName(configName)
}
}

Expand All @@ -322,6 +323,7 @@ class ProtobufPlugin implements Plugin<Project> {
description = "Extracts proto files from compile dependencies for includes"
destDir = getExtractedIncludeProtosDir(sourceSetName) as File
configName = Utils.getConfigName(sourceSetName, 'compile')
dependsOn project.configurations.getByName(configName)
}
}

Expand Down

0 comments on commit 1d6e1ec

Please sign in to comment.