Upgrade gradle to 5.3.1

.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 ../clientserver
+  - ./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,29 +1,39 @@
-import org.apache.tools.ant.filters.ReplaceTokens
 import java.text.SimpleDateFormat
-import org.ajoberstar.grgit.*
 
+buildscript {
+    dependencies {
+        classpath "com.diffplug.spotless:spotless-plugin-gradle:3.26.1"
+        classpath "org.ajoberstar.grgit:grgit-gradle:4.0.1"
+    }
 
+    repositories {
+        mavenCentral()
+        jcenter()
+        maven { url 'https://plugins.gradle.org/m2/' }
+    }
+}
 
+plugins {
+    id "org.ajoberstar.grgit" version "4.0.1"
+    id "com.github.spotbugs" version "3.0.0"
+}
 apply plugin: 'java'
-apply plugin: 'findbugs'
 apply plugin: 'pmd'
 apply plugin: 'maven'
 apply plugin: 'com.diffplug.gradle.spotless'
 
-
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
 if (version == 'unspecified') {
     version = getVersionName()
 }
 
-ext.repo = Grgit.open(project.file('.'))
-
+ext.repo = grgit.open(currentDir: project.file('.'))
 
 spotless {
     java {
-        eclipseFormatFile 'build-resources/eclipse.prefs.formatter.xml'
+        eclipse().configFile 'build-resources/eclipse.prefs.formatter.xml'
     }
 }
 
@@ -33,54 +43,36 @@ configurations {
 }
 
 
-task wrapper(type: Wrapper) {
-    gradleVersion='2.1'
-}
-
 install {
     repositories.mavenInstaller {
-        pom.version = project.version;
-        pom.artifactId = 'clientserver';
-        pom.groupId = 'net.rptools.clientserver';
+        pom.version = project.version
+        pom.artifactId = 'clientserver'
+        pom.groupId = 'net.rptools.clientserver'
     }
 }
 
 
 uploadArchives {
     repositories.mavenDeployer {
-        pom.version = project.version;
-        pom.artifactId = 'clientserver';
-        pom.groupId = 'net.rptools.clientserver';
-        configuration = configurations.deployerJars;
+        pom.version = project.version
+        pom.artifactId = 'clientserver'
+        pom.groupId = 'net.rptools.clientserver'
+        configuration = configurations.deployerJars
         repository url: 'file://' + projectDir + '/../maven-repo'
     }
 }
 
-buildscript {
-    repositories {
-        mavenCentral()
-        jcenter()
-        maven {
-            url 'https://plugins.gradle.org/m2/'
-        }
-    }
-    dependencies {
-        classpath 'org.ajoberstar:gradle-git:0.11.2'
-        classpath 'com.diffplug.gradle.spotless:spotless:1.3.0-SNAPSHOT'
-    }
-}
-
 
 dependencies {
-    compile 'commons-logging:commons-logging:1.1.1'
-    compile 'log4j:log4j:1.2.16'
-    compile 'com.caucho.hessian:hessian:3.1.6'
+    implementation 'commons-logging:commons-logging:1.1.1'
+    implementation 'log4j:log4j:1.2.16'
+    implementation 'com.caucho.hessian:hessian:3.1.6'
     testCompile group: 'junit', name: 'junit', version: '4.11'
     deployerJars 'org.apache.maven.wagon:wagon-ssh:2.2'
 }
 
-ext.compileDate = new Date();
-ext.yyyymmdd = (new SimpleDateFormat('yyyyMMDD')).format(ext.compileDate);
+ext.compileDate = new Date()
+ext.yyyymmdd = (new SimpleDateFormat('yyyyMMDD')).format((Date)ext.compileDate)
 
 
 repositories {
@@ -107,9 +99,9 @@ def getVersionName() {
     }
 }
 
-findbugs {
+spotbugs {
     ignoreFailures = true
-    toolVersion = '3.0.0'
+    toolVersion = '3.1.12'
     effort = 'max'
     sourceSets = []  // Empty source set so it wont run during build/check
 }
@@ -119,16 +111,16 @@ pmd {
     sourceSets = []  // Empty source set so it wont run during tebuild/check
 }
 
-
-
-task showBuildVersion() << {
-    println 'Build Version Number = ' + project.version
+task showBuildVersion() {
+    doLast {
+        println 'Build Version Number = ' + project.version
+    }
 }
 
 jar {
     manifest {
         attributes 'Implementation-Title': 'clientserver',
-                   'Implementation-Version': project.version
+                'Implementation-Version': project.version
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Sep 18 13:53:52 ACST 2015
 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-2.1-bin.zip