Refactoring build scripts

CHANGELOG.md

@@ -1,8 +1,22 @@
 # Changelog
 
-## Unreleased
+## 1.18
 ### No issue
 
+**Latest Gradle**
+
+
+[608449030fbc38e](https://github.com/tomasbjerre/violation-comments-to-gitlab-lib/commit/608449030fbc38e05456e26de8fcc1e131d7b1b9) Tomas Bjerre *2017-11-01 18:30:50*
+
+
+## 1.17
+### No issue
+
+**Better error message if project cannot be found**
+
+
+[a6dc49de8258dfc](https://github.com/tomasbjerre/violation-comments-to-gitlab-lib/commit/a6dc49de8258dfc77b903b615fd3650ea00a55d8) Tomas Bjerre *2017-11-01 17:12:58*
+
 **Doc**
 
 

build.gradle

@@ -1,109 +1,26 @@
+apply plugin: 'java'
+
+project.ext.tags = ['violation', 'static code analysis', 'Checkstyle', 'CPPLint', 'CPPCheck', 'CSSLint', 'Findbugs', 'Flake8', 'PyLint', 'Pep8', 'Mccabe', 'PyFlakes', 'JSHint', 'Lint', 'PerlCritic', 'PMD', 'ReSharper', 'XMLLint']
+group = 'se.bjurr.violations'
+description = 'Library that adds violation comments from static code analysis to GitLab.'
+
+
 buildscript {
  repositories {
-  jcenter()
-  maven {
-   url "https://plugins.gradle.org/m2/"
-  }
+  maven { url "https://jitpack.io" }
  }
  dependencies {
-  classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
-  classpath 'net.researchgate:gradle-release:2.4.0'
-  classpath 'gradle.plugin.se.bjurr.gitchangelog:git-changelog-gradle-plugin:1.40'
-  classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.6'
+  classpath 'com.github.tomasbjerre:gradle-scripts:master-SNAPSHOT'
  }
 }
+apply from: project.buildscript.classLoader.getResource('java.gradle').toURI()
+apply from: project.buildscript.classLoader.getResource('changelog.gradle').toURI()
+apply from: project.buildscript.classLoader.getResource('release.gradle').toURI()
 
-apply plugin: 'java'
-apply plugin: 'maven'
-apply plugin: 'eclipse'
-apply plugin: 'signing'
-apply plugin: 'com.bmuschko.nexus'
-apply plugin: 'net.researchgate.release'
-apply plugin: 'se.bjurr.gitchangelog.git-changelog-gradle-plugin'
-apply plugin: 'com.github.sherter.google-java-format'
-
-task gitChangelogTask(type: se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask) {
- filePath = "CHANGELOG.md";
- templateContent = new File('changelog.mustache').getText('UTF-8');
- removeIssueFromMessage = true
-}
-
-group = 'se.bjurr.violations'
-
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
-
-repositories {
- mavenLocal()
- mavenCentral()
- maven { url 'https://jitpack.io' }
-}
 
 dependencies {
  compile 'se.bjurr.violations:violation-comments-lib:1.44'
  compile 'com.github.tomasbjerre:java-gitlab-api:master'
  testCompile 'junit:junit:4.12'
  testCompile 'org.assertj:assertj-core:2.3.0'
 }
-
-eclipse {
- classpath {
-  downloadSources = true
-  downloadJavadoc = true
- }
-}
-
-sourceSets {
- main.java.srcDirs = ['src/main/java' ]
- test.java.srcDirs = ['src/test/java' ]
-}
-
-if (JavaVersion.current().isJava8Compatible()) {
- allprojects {
-  tasks.withType(Javadoc) {
-   options.addStringOption('Xdoclint:none', '-quiet')
-  }
- }
-}
-
-modifyPom {
- project {
-  name 'Violation Comments to GitLab Lib'
-  description 'Library that adds violation comments from static code analysis to GitHub.'
-  url 'https://github.com/tomasbjerre/violation-comments-to-gitlab-lib'
-  inceptionYear '2016'
-   scm {
-   url 'https://github.com/tomasbjerre/violation-comments-to-gitlab-lib'
-   connection 'scm:https://[email protected]/tomasbjerre/violation-comments-to-gitlab-lib.git'
-   developerConnection 'scm:git://github.com/tomasbjerre/violation-comments-to-gitlab-lib.git'
-  }
-
-  licenses {
-   license {
-    name 'The Apache Software License, Version 2.0'
-    url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-    distribution 'repo'
-   }
-  }
-
-  developers {
-   developer {
-    id 'tomasbjerre'
-    name 'Tomas Bjerre'
-    email '[email protected]'
-   }
-  }
- }
-}
-
-extraArchive {
- sources = true
- tests = true
- javadoc = true
-}
-
-compileJava.dependsOn 'googleJavaFormat'
-
-afterReleaseBuild.dependsOn {
- [install, uploadArchives]
-}

build.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-./gradlew clean gitChangelogTask eclipse build install -i
+./gradlew --refresh-dependencies clean gitChangelogTask eclipse build install -i

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sun Oct 18 08:40:15 CEST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip

gradlew

@@ -1,25 +1,43 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line