Merge pull request RPTools#28 from RPTools/develop

Author: cwisniew

.travis.yml

@@ -0,0 +1,68 @@
+language: java
+sudo: false
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode10
+install:
+  # Install Oracle JDK 10 and set as JAVA_HOME
+  - pwd
+  - cd ..
+  - mkdir java
+  - cd java
+  - wget http://www.nerps.net/jdk10/jdk-10.0.2_osx-x64_bin.dmg
+  - MOUNTDEV=$(hdiutil mount jdk-10.0.2_osx-x64_bin.dmg | awk '/dev.disk/{print$1}')
+  - echo $MOUNTDEV
+  - MOUNTDIR="$(mount | grep JDK | awk '{$1=$2="";sub(" [(].*","");sub("^  ","");print}')"
+  - echo $MOUNTDIR
+  - sudo installer -pkg "${MOUNTDIR}/"*.pkg -target /
+  - hdiutil unmount "$MOUNTDIR"
+  - echo java home was $JAVA_HOME
+  - export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-10.0.2.jdk/Contents/Home
+  - echo java home is $JAVA_HOME
+  - export PATH=$JAVA_HOME/bin:$PATH
+  - echo $PATH
+  - cd ../parser
+  - ./gradlew -version
+  - java -version
+script:
+  - ./gradlew build
+before_deploy:
+  #   # Install Sentry.io CLI
+  #  - curl -sL https://sentry.io/get-cli/ | bash
+  #  - sentry-cli info
+  - echo Version is $TRAVIS_TAG
+  #  # Create a Sentry release
+  #  - sentry-cli releases new "$TRAVIS_TAG"
+  # Create Deploy Artifacts
+  - ./gradlew deploy
+deploy:
+  provider: releases
+  api_key: $GITHUB_RELEASE_KEY
+  file_glob: true
+  file: releases/release-*/*
+  overwrite: true
+  skip_cleanup: true
+  target_commitish: $TRAVIS_COMMIT
+  tag_name: $TRAVIS_TAG
+  draft: false
+  prerelease: true
+  on:
+    repo: $REPO
+    tags: true
+    all_branches: true
+after_deploy:
+# Finalize Sentry release
+#  - sentry-cli releases finalize "$TRAVIS_TAG"
+# Associate commits with the Sentry release
+#  - sentry-cli releases set-commits "$TRAVIS_TAG" --auto
+# Tell Sentry.io we have deployed a release
+#  - sentry-cli releases deploys "$TRAVIS_TAG" new -e Production
+after_success:
+  - wget $TRAVIS_DISCORD_WEBHOOK_SCRIPT_URL
+  - chmod +x send.sh
+  - ./send.sh success $DISCORD_URL
+after_failure:
+  - wget $TRAVIS_DISCORD_WEBHOOK_SCRIPT_URL
+  - chmod +x send.sh
+  - ./send.sh failure $DISCORD_URL

build.gradle

@@ -1,8 +1,7 @@
-import java.text.SimpleDateFormat
-
 buildscript {
     dependencies {
-        classpath "com.diffplug.spotless:spotless-plugin-gradle:3.13.0"
+        classpath "com.diffplug.spotless:spotless-plugin-gradle:3.26.1"
+        classpath "org.ajoberstar.grgit:grgit-gradle:4.0.1"
         classpath 'antlr:antlr:2.7.7'
     }
 
@@ -13,7 +12,7 @@ buildscript {
 
 // Access Git info from build script
 plugins {
-    id "org.ajoberstar.grgit" version "3.0.0"
+    id "org.ajoberstar.grgit" version "4.0.1"
     id 'antlr'
 }
 
@@ -23,9 +22,8 @@ apply plugin: 'com.diffplug.gradle.spotless'
 apply plugin: 'maven'
 
 
-
-sourceCompatibility = 10
-targetCompatibility = 10
+project.sourceCompatibility = 10
+project.targetCompatibility = 10
 
 
 // In this section you declare where to find the dependencies of your project
@@ -36,18 +34,17 @@ repositories {
 }
 
 
-
 dependencies {
-    compile 'rhino:js:1.6R5'
-    compile 'antlr:antlr:2.7.6'
-    testCompile group: 'junit', name: 'junit', version: '4.11'
+    implementation 'rhino:js:1.6R5'
+    implementation 'antlr:antlr:2.7.6'
+    testImplementation group: 'junit', name: 'junit', version: '4.11'
     antlr 'antlr:antlr:2.7.7'
 }
 
 // Custom properties
 ext {
     // Get tag and commit info from Git to use for version numbering
-    def repo = org.ajoberstar.grgit.Grgit.open(currentDir: file('.'))
+    def repo = grgit.open(currentDir: file('.'))
     def head = repo.head()
     def tags = repo.tag.list().find {
         it.commit == head
@@ -100,19 +97,19 @@ configurations {
 
 install {
     repositories.mavenInstaller {
-        pom.version = project.version;
-        pom.artifactId = 'parser';
-        pom.groupId = 'net.rptools.parser';
+        pom.version = project.version
+        pom.artifactId = 'parser'
+        pom.groupId = 'net.rptools.parser'
     }
 }
 
 
 uploadArchives {
     repositories.mavenDeployer {
-        pom.version = project.version;
-        pom.artifactId = 'parser';
-        pom.groupId = 'net.rptools.parser';
-        configuration = configurations.deployerJars;
+        pom.version = project.version
+        pom.artifactId = 'parser'
+        pom.groupId = 'net.rptools.parser'
+        configuration = configurations.deployerJars
         repository url: 'file://' + projectDir + '/../maven-repo'
     }
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Mon Apr 22 00:41:02 ACST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip