You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by re...@apache.org on 2019/01/19 04:59:27 UTC

[beam] branch master updated: Remove generated code from srcSets.

This is an automated email from the ASF dual-hosted git repository.

reuvenlax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 8ecf9d3  Remove generated code from srcSets.
     new 7a6f08a  Merge pull request #7569: Remove generated code from srcSets.
8ecf9d3 is described below

commit 8ecf9d30d121e3d3cc7aba41fbe756eac681e877
Author: Reuven Lax <re...@google.com>
AuthorDate: Fri Jan 18 14:12:40 2019 -0800

    Remove generated code from srcSets.
---
 .../src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 48a1470..81cc39a 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -1443,10 +1443,7 @@ class BeamModulePlugin implements Plugin<Project> {
 
     project.ext.applyAntlrNature = {
       project.apply plugin: 'antlr'
-      def generatedDir = "${project.buildDir}/generated/source-src/antlr/main/java/"
-      project.sourceSets {
-        generated { java.srcDir generatedDir }
-      }
+      def generatedDir = "${project.buildDir}/generated-src/antlr/main/java/"
       project.idea {
         module {
           sourceDirs += project.file(generatedDir)