Use correct file in Compiler. Always retrieve version from git describe.

- project property "withNewVersion" applies this version to current task(s) like jar or publish
- project property "asSnapshot" appends "-SNAPSHOT" to the version

.gitignore

@@ -10,3 +10,4 @@ src/test/jastadd/*/*.ast
 src/test/jastadd/*/*.jadd
 src/test/jastadd/*/*ResolverStubs.jrag
 !src/test/jastadd/*/MyRefResolver.jadd
+/gradle.properties

build.gradle

@@ -14,6 +14,9 @@ repositories {
     jcenter()
 }
 
+group = 'org.jastadd'
+apply plugin: 'maven-publish'
+
 buildscript {
     repositories.jcenter()
     dependencies {
@@ -43,6 +46,44 @@ sourceSets {
     }
 }
 
+/* version string handling adapted from https://bitbucket.org/extendj/extendj/src/master/build.gradle
+written by Jesper Öqvist <jesper.oqvist@cs.lth.se> */
+def versionFile = 'src/main/resources/RelASTVersion.properties'
+def oldProps = new Properties()
+String oldFullVersion, fullVersion
+
+try {
+    file(versionFile).withInputStream { stream -> oldProps.load(stream) }
+    oldFullVersion = oldProps['version']
+} catch (ignored) {
+    // this happens, if either the properties file is not present, or cannot be read from
+    oldFullVersion = "???"
+}
+
+try {
+    def proc = 'git describe'.execute(null, rootDir)
+    if  (proc.waitFor() == 0) {
+        fullVersion = proc.text.trim()
+        if (hasProperty('withNewVersion')) {
+            // Trim to get latest tag
+            version = (fullVersion =~ /-\d+\-g.+$/).replaceAll('')
+            if (hasProperty('asSnapshot')) {
+                version += '-SNAPSHOT'
+            }
+            println("Using version " + version)
+        }
+        if (oldFullVersion != fullVersion) {
+            def props = new Properties()
+            props['version'] = fullVersion
+            props.store(file(versionFile).newWriter(), null)
+        }
+    } else {
+        logger.warn('No git tags found to retrieve version.')
+    }
+} catch (IOException e) {
+    logger.warn("Failded to run git describe (${e.getMessage()}) to retrieve version.")
+}
+
 jar {
     manifest {
         attributes "Main-Class": 'org.jastadd.relast.compiler.Compiler'
@@ -110,46 +151,27 @@ jastadd {
     jastaddOptions = ["--lineColumnNumbers", "--safeLazy", "--visitCheck=true", "--rewrite=cnta", "--cache=all"]
 }
 
-def versionFile = 'src/main/resources/RelASTVersion.properties'
-task updateVersion {
-    /* version string handling adapted from https://bitbucket.org/extendj/extendj/src/master/build.gradle
-       written by Jesper Öqvist <jesper.oqvist@cs.lth.se> */
-    group 'build'
-    description 'Updates the version file for RelAST'
-
-    doLast {
-        def oldProps = new Properties()
-        String oldFullVersion, fullVersion
-
-        try {
-            file(versionFile).withInputStream { stream -> oldProps.load(stream) }
-            oldFullVersion = oldProps['version']
-        } catch (ignored) {
-            oldFullVersion = "???"
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifact("build/libs/relast-${version}.jar") {
+                extension 'jar'
             }
-        try {
-            def proc = 'git describe'.execute(null, rootDir)
-            if  (proc.waitFor() == 0) {
-                fullVersion = proc.text.trim()
-                if (hasProperty('withNewVersion')) {
-                    // Trim to get latest tag:
-                    version = (fullVersion =~ /-\d+\-g.+$/).replaceAll('')
         }
-                if (oldFullVersion != fullVersion) {
-                    def props = new Properties()
-                    props['version'] = fullVersion
-                    props.store(file(versionFile).newWriter(), null)
     }
-            } else {
-                logger.warn('No git tags found.')
+    repositories {
+        maven {
+            name 'nexus'
+            url "http://172.22.1.152:8081/repository/" + (project.hasProperty('asSnapshot') ? "maven-snapshots" : "maven-releases/")
+            credentials {
+                username project.repoUser
+                password project.repoPassword
             }
-        } catch (IOException e) {
-            logger.warn("Failded to run git describe (${e.getMessage()}).")
         }
     }
 }
 
-processResources.dependsOn updateVersion
+publish.dependsOn jar
 
 task preprocessRelationTest(type: JavaExec, group: 'verification') {
 

src/main/java/org/jastadd/relast/compiler/Compiler.java

@@ -136,7 +136,7 @@ public class Compiler {
    */
   private String readVersion() {
     try {
-      ResourceBundle resources = ResourceBundle.getBundle("Version");
+      ResourceBundle resources = ResourceBundle.getBundle("RelASTVersion");
       return resources.getString("version");
     } catch (MissingResourceException e) {
       return "version ?";