diff --git a/build.gradle b/build.gradle index e924e088..160e13e0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,27 +1,20 @@ -buildscript { - repositories { - jcenter() - maven { - url "https://plugins.gradle.org/m2/" - } - } - dependencies { - classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1' - classpath 'net.researchgate:gradle-release:2.2.2' - classpath "gradle.plugin.se.bjurr.gitchangelog:git-changelog-gradle-plugin:1.48" - classpath 'gradle.plugin.com.github.sherter.google-java-format:google-java-format-gradle-plugin:0.6' - } +plugins { + id "se.bjurr.gitchangelog.git-changelog-gradle-plugin" version "1.53" + id "com.github.sherter.google-java-format" version "0.6" + id "net.researchgate.release" version "2.6.0" + id "com.jfrog.bintray" version "1.7.3" } apply plugin: 'java' +apply plugin: 'java-library' apply plugin: 'maven' +apply plugin: 'maven-publish' 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' +apply from: "$rootDir/gradle/release.gradle" + task gitChangelogTask(type: se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask) { gitHubApi = "https://api.github.com/repos/tomasbjerre/violations-lib"; gitHubToken = System.properties['GITHUB_OAUTH2TOKEN']; @@ -39,6 +32,7 @@ targetCompatibility = 1.7 repositories { mavenLocal() mavenCentral() + jcenter() } dependencies { @@ -72,44 +66,4 @@ if (JavaVersion.current().isJava8Compatible()) { } } -modifyPom { - project { - name 'Violations Lib' - description 'Library for parsing report files from static code analysis.' - url 'https://github.com/tomasbjerre/violations-lib' - inceptionYear '2015' - scm { - url 'https://github.com/tomasbjerre/violations-lib' - connection 'scm:https://tomasbjerre@github.com/tomasbjerre/violations-lib.git' - developerConnection 'scm:git://github.com/tomasbjerre/violations-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 'tomas.bjerre85@gmail.com' - } - } - } -} - -extraArchive { - sources = true - tests = true - javadoc = true -} - compileJava.dependsOn 'googleJavaFormat' - -afterReleaseBuild.dependsOn { - [install, uploadArchives] -} diff --git a/changelog.mustache b/changelog.mustache index 390f8cfd..baf30315 100644 --- a/changelog.mustache +++ b/changelog.mustache @@ -1,6 +1,6 @@ -# Git Changelog changelog +# Violations changelog -Changelog of Git Changelog. +Changelog of Violations. {{#tags}} ## {{name}} diff --git a/gradle/release.gradle b/gradle/release.gradle new file mode 100644 index 00000000..42821351 --- /dev/null +++ b/gradle/release.gradle @@ -0,0 +1,96 @@ +task sourcesJar(type: Jar, dependsOn: classes) { + classifier = 'sources' + from sourceSets.main.allSource +} + +task javadocJar(type: Jar, dependsOn: javadoc) { + classifier = 'javadoc' + from javadoc.destinationDir +} + +artifacts { + archives sourcesJar, javadocJar +} + +def pomConfig = { + scm { + url 'https://github.com/tomasbjerre/'+project.name + connection 'scm:https://tomasbjerre@github.com/tomasbjerre/'+project.name+'.git' + developerConnection 'scm:git://github.com/tomasbjerre/'+project.name+'.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 'tomas.bjerre85@gmail.com' + } + } +} + +publishing { + publications { + MyPublication(MavenPublication) { + from components.java + artifact sourcesJar + artifact javadocJar + groupId 'se.bjurr.violations' + artifactId project.name + version version + pom.withXml { + def root = asNode() + root.appendNode('description', 'Library for parsing report files from static code analysis.') + root.appendNode('name', 'Violations Lib') + root.appendNode('url', 'https://github.com/tomasbjerre/'+project.name) + root.appendNode('inceptionYear', '2015') + root.children().last() + pomConfig + } + } + } +} + +bintray { + user = System.getenv('BINTRAY_USER') + key = System.getenv('BINTRAY_KEY') + publications = ['MyPublication'] + publish = true + pkg { + repo = 'bjurr' + name = project.name + userOrg = 'tomasbjerre' + desc = 'Library for parsing report files from static code analysis.' + licenses = ['Apache-2.0'] + vcsUrl = 'git@github.com:tomasbjerre/'+project.name+'.git' + websiteUrl = 'https://github.com/tomasbjerre/violations-lib' + issueTrackerUrl = 'https://github.com/tomasbjerre/'+project.name+'/issues' + labels = ['violations', 'static code analysis', 'lint'] + publicDownloadNumbers = true + githubRepo = 'tomasbjerre/' + project.name + githubReleaseNotesFile = 'README.md' + version { + name = project.version + released = new Date() + vcsTag = project.version + gpg { + sign = true + } + mavenCentralSync { + sync = true + user = System.getenv('NEXUS_USERNAME') + password = System.getenv('NEXUS_PASSWORD') + } + } + } +} + +afterReleaseBuild.dependsOn { + [install, bintrayUpload] +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e8c6bf7b..6b6ea3ab 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4a65319..0e680f37 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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-2.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip diff --git a/gradlew b/gradlew index 97fac783..cccdd3d5 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,20 +6,38 @@ ## ############################################################################## -# 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" "$@" diff --git a/gradlew.bat b/gradlew.bat index aec99730..e95643d6 100644 --- a/gradlew.bat +++ b/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