diff --git a/build.gradle b/build.gradle index a7c824c..f901047 100644 --- a/build.gradle +++ b/build.gradle @@ -1,51 +1,36 @@ 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 = 'Report static code analysis to Bitbucket Cloud.' -project.ext.useShadowJar = true -project.ext.syncCentral = false - -jar { - manifest { - attributes 'Main-Class': 'se.bjurr.violations.main.Main' - } -} - buildscript { repositories { - maven { url "https://jitpack.io" } + mavenCentral() + mavenLocal() } dependencies { - classpath 'com.github.tomasbjerre:gradle-scripts:master-SNAPSHOT' + classpath 'se.bjurr.gradle:gradle-scripts:2.+' } } -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 from: project.buildscript.classLoader.getResource('violations.gradle').toURI() - +project.ext.buildConfig = [ + publishing: [ + relocate: [ + 'org:org', + 'javax:javax', + 'com:com', + 'se:se', + 'io:io' + ] + ], + violations: [ + updateReadme: true + ], + manifest: [ + mainClass: 'se.bjurr.violations.main.Main' + ] +] +apply from: project.buildscript.classLoader.getResource('main.gradle').toURI() dependencies { - compile 'se.bjurr.violations:violation-comments-to-bitbucket-cloud-lib:1.15' - compile 'se.bjurr.violations:violations-lib:1.132' + compile 'se.bjurr.violations:violation-comments-to-bitbucket-cloud-lib:1.+' + compile 'se.bjurr.violations:violations-lib:1.+' compile 'se.softhouse:jargo:0.1.1' compile 'org.slf4j:slf4j-simple:1.8.0-beta2' } - -task copyDependencies(type: Copy) { - from configurations.default - into 'build/libs' -} - -shadowJar { - mergeServiceFiles() { - exclude 'META-INF/services/*' - } - - relocate 'org', 'org' - relocate 'javax', 'javax' - relocate 'com', 'com' - relocate 'se', 'se' - relocate 'io', 'io' -} diff --git a/gradle.properties b/gradle.properties index b76ad79..9670ea6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,3 @@ version = 1.21-SNAPSHOT +group = 'se.bjurr.violations' +description = 'Report static code analysis to Bitbucket Cloud.' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 6b6ea3a..5c2d1cf 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 91dd0e8..442d913 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sat Nov 18 13:33:09 CET 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip diff --git a/gradlew b/gradlew index cccdd3d..b0d6d0a 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ 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="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" diff --git a/gradlew.bat b/gradlew.bat index aec9973..15e1ee3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -8,14 +24,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="-Xmx64m" "-Xms64m" + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,10 +62,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 +75,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 diff --git a/release.sh b/release.sh index 810661d..96aeb8f 100755 --- a/release.sh +++ b/release.sh @@ -1,7 +1,7 @@ #!/bin/bash ./gradlew clean -./gradlew release || exit 1 +./gradlew releaseMinor || exit 1 git reset --hard HEAD~1 ./publish-npm.sh