Skip to content

Commit

Permalink
build.gradle: Make protobuf-gradle-plugin use protoc from the reposit…
Browse files Browse the repository at this point in the history
…ory.

This updates the protoc version to 3.6.1, fixing many warnings in the generated sources.
  • Loading branch information
Andreas Schildbach committed Feb 23, 2019
1 parent 1d4c8e6 commit 81ddd50
Show file tree
Hide file tree
Showing 8 changed files with 2,074 additions and 524 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Expand Up @@ -5,8 +5,7 @@ language: java
jdk:
- openjdk8
- openjdk11
install:
- sudo apt-get install -y protobuf-compiler
install: true
script:
# excluding wallet-template because of the unreliable JavaFX dependency
- gradle clean build -x :wallettemplate:compileJava
Expand Down
3 changes: 3 additions & 0 deletions core/build.gradle
Expand Up @@ -29,6 +29,9 @@ compileJava.options.encoding = 'UTF-8'
compileTestJava.options.encoding = 'UTF-8'

protobuf {
protoc {
artifact = 'com.google.protobuf:protoc:3.6.1'
}
generatedFilesBaseDir = new File(projectDir, '/src') // workaround for '$projectDir/src'
}

Expand Down

0 comments on commit 81ddd50

Please sign in to comment.