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/25 17:30:40 UTC
[beam] branch master updated: [ANTLR Plugin] align plugin
configuration with conventions
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 246804d [ANTLR Plugin] align plugin configuration with conventions
new e564e3f Merge pull request #7616: [ANTLR Plugin] align plugin configuration with conventions
246804d is described below
commit 246804d2c565d1d581859f7faabd0dfbf9428e5b
Author: Michael Luckey <25...@users.noreply.github.com>
AuthorDate: Thu Jan 24 18:54:54 2019 +0100
[ANTLR Plugin] align plugin configuration with conventions
---
.../src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 6 +++---
.../beam/sdk/schemas/parser/generated/FieldSpecifierNotation.g4 | 0
2 files changed, 3 insertions(+), 3 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 7340f8f..96d629f 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -1450,11 +1450,11 @@ class BeamModulePlugin implements Plugin<Project> {
project.ext.applyAntlrNature = {
project.apply plugin: 'antlr'
- def generatedDir = "${project.buildDir}/generated-src/antlr/main/java/"
project.idea {
module {
- sourceDirs += project.file(generatedDir)
- generatedSourceDirs += project.file(generatedDir)
+ // mark antlrs output folders as generated
+ generatedSourceDirs += project.generateGrammarSource.outputDirectory
+ generatedSourceDirs += project.generateTestGrammarSource.outputDirectory
}
}
}
diff --git a/sdks/java/core/src/main/antlr/java/org/apache/beam/sdk/schemas/parser/generated/FieldSpecifierNotation.g4 b/sdks/java/core/src/main/antlr/org/apache/beam/sdk/schemas/parser/generated/FieldSpecifierNotation.g4
similarity index 100%
rename from sdks/java/core/src/main/antlr/java/org/apache/beam/sdk/schemas/parser/generated/FieldSpecifierNotation.g4
rename to sdks/java/core/src/main/antlr/org/apache/beam/sdk/schemas/parser/generated/FieldSpecifierNotation.g4