[PR-4815] Make antlr version consistent (unfortunately not on version 4.6 due to errors.). Also use appveyor version numbering.

Scott Dennison · Scott Dennison · commit 1f074c34ad3a · 2019-02-21T21:05:37.000Z
diff --git a/development/java/Rubberduck.Parsing/Grammar/build.gradle b/development/java/Rubberduck.Parsing/Grammar/build.gradle
@@ -1,26 +1,30 @@
 buildscript {
+	project.ext.antlrVersion = '4.7.2'
+
     repositories {
-        mavenCentral();
+        mavenCentral()
     }
 
     dependencies {
-        classpath group: 'org.antlr', name: 'antlr4', version: '4.7.2'
+        classpath group: 'org.antlr', name: 'antlr4', version: "${project.ext.antlrVersion}"
     }
 }
 
 plugins {
     id 'java'
 }
 
+def envVersion = System.getenv("APPVEYOR_VERSION")
+
 group 'com.rubberduckvba.rubberduck.parsing'
-version '1'
+version envVersion==null?'snapshot':envVersion
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    compile group: 'org.antlr', name: 'antlr4-runtime', version: '4.7.2'
+    compile group: 'org.antlr', name: 'antlr4-runtime', version: "${project.ext.antlrVersion}"
 }
 
 def grammarCodeGenDest = "${projectDir}/src/main/gen"

Original file line number	Diff line number	Diff line change
`@@ -1,26 +1,30 @@`
`1`	`1`	`buildscript {`
	`2`	`+ project.ext.antlrVersion = '4.7.2'`
	`3`	`+`
`2`	`4`	`repositories {`
`3`		`- mavenCentral();`
	`5`	`+ mavenCentral()`
`4`	`6`	`}`
`5`	`7`
`6`	`8`	`dependencies {`
`7`		`- classpath group: 'org.antlr', name: 'antlr4', version: '4.7.2'`
	`9`	`+ classpath group: 'org.antlr', name: 'antlr4', version: "${project.ext.antlrVersion}"`
`8`	`10`	`}`
`9`	`11`	`}`
`10`	`12`
`11`	`13`	`plugins {`
`12`	`14`	`id 'java'`
`13`	`15`	`}`
`14`	`16`
	`17`	`+def envVersion = System.getenv("APPVEYOR_VERSION")`
	`18`	`+`
`15`	`19`	`group 'com.rubberduckvba.rubberduck.parsing'`
`16`		`-version '1'`
	`20`	`+version envVersion==null?'snapshot':envVersion`
`17`	`21`
`18`	`22`	`repositories {`
`19`	`23`	`mavenCentral()`
`20`	`24`	`}`
`21`	`25`
`22`	`26`	`dependencies {`
`23`		`- compile group: 'org.antlr', name: 'antlr4-runtime', version: '4.7.2'`
	`27`	`+ compile group: 'org.antlr', name: 'antlr4-runtime', version: "${project.ext.antlrVersion}"`
`24`	`28`	`}`
`25`	`29`
`26`	`30`	`def grammarCodeGenDest = "${projectDir}/src/main/gen"`