commit 5d398fea258135d62b711e584b57cffff280b787
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Jun 14 15:00:14 2019 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Fri Jun 14 15:00:14 2019 +0200
tree a014ba84223f6731713003e9e619de5156704e32
parent 74288f0054629545f7df7e6f92c7fab81ca86f28

Guard access to generated files in build.gradle

Change-Id: Ib5c1d85b420b617d1654f75306d58ed676782358

build.gradle

diff --git a/build.gradle b/build.gradle
index 7a31aee..9bd2e90 100644
--- a/build.gradle
+++ b/build.gradle
@@ -155,8 +155,8 @@
         java {
             srcDirs = ['src/test/examplesProto']
         }
-        compileClasspath = files(file("build/generated/test/proto").listFiles())
-        compileClasspath += files("third_party/protobuf-lite/libprotobuf_lite.jar")
+        compileClasspath = files("third_party/protobuf-lite/libprotobuf_lite.jar")
+        compileClasspath += fileTree(dir: "build/generated/test/proto", include: "*.jar")
         output.resourcesDir = 'build/classes/examplesProto'
     }
     jctfCommon {
@@ -1116,8 +1116,8 @@
     task "compile_examples_proto"(type: JavaCompile) {
         source = fileTree(dir: examplesProtoDir, include: "**/*.java")
         destinationDir = file("build/test/examplesProto/classes")
-        classpath = files(file("build/generated/test/proto").listFiles())
-        classpath += files("third_party/protobuf-lite/libprotobuf_lite.jar")
+        classpath = files("third_party/protobuf-lite/libprotobuf_lite.jar")
+        classpath += fileTree(dir: "build/generated/test/proto", include: "*.jar")
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }