Updated to gradle 5.3.1

This commit is contained in:
Rsl1122 2019-04-03 22:44:26 +03:00
parent 1335ba299f
commit 461c9ea472
8 changed files with 45 additions and 10 deletions

View File

@ -5,7 +5,7 @@ plugins {
id "org.sonarqube" version "2.6.2" id "org.sonarqube" version "2.6.2"
id "net.ltgt.apt" version "0.19" id "net.ltgt.apt" version "0.19"
id "net.ltgt.apt-idea" version "0.19" id "net.ltgt.apt-idea" version "0.19"
id "com.github.johnrengelman.shadow" version "4.0.2" id "com.github.johnrengelman.shadow" version "5.0.0"
} }
allprojects { allprojects {
@ -15,7 +15,7 @@ allprojects {
version "4.7.2" version "4.7.2"
test { test {
// useJUnitPlatform() useJUnitPlatform()
testLogging { testLogging {
events "passed", "failed" events "passed", "failed"
exceptionFormat "full" exceptionFormat "full"
@ -117,6 +117,9 @@ subprojects {
testCompile "mysql:mysql-connector-java:8.0.15" // MySQL testCompile "mysql:mysql-connector-java:8.0.15" // MySQL
} }
shadowJar {
exclude 'META-INF/versions/'
}
configurations { configurations {
testArtifacts.extendsFrom testRuntime testArtifacts.extendsFrom testRuntime

View File

@ -1,6 +1,6 @@
dependencies { dependencies {
compile "com.djrapitops:AbstractPluginFramework-api:$abstractPluginFrameworkVersion" compile "com.djrapitops:AbstractPluginFramework-api:$abstractPluginFrameworkVersion"
compile project(path: ":api", configuration: 'shadow') compile project(":api")
compile project(path: ":extensions", configuration: 'shadow') compile project(path: ":extensions", configuration: 'shadow')
compile "com.djrapitops:PlanPluginBridge:$planPluginBridgeVersion" compile "com.djrapitops:PlanPluginBridge:$planPluginBridgeVersion"
compile "org.apache.httpcomponents:httpclient:$httpClientVersion" compile "org.apache.httpcomponents:httpclient:$httpClientVersion"
@ -14,7 +14,7 @@ dependencies {
compile "com.maxmind.geoip2:geoip2:$geoIpVersion" compile "com.maxmind.geoip2:geoip2:$geoIpVersion"
compileOnly "com.google.guava:guava:$guavaVersion" compileOnly "com.google.guava:guava:$guavaVersion"
testCompile project(path: ":api", configuration: 'shadow') testCompile project(":api")
} }
shadowJar { shadowJar {

Binary file not shown.

18
Plan/gradlew vendored
View File

@ -1,5 +1,21 @@
#!/usr/bin/env sh #!/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 ## Gradle start up script for UN*X
@ -28,7 +44,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"` 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. # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m"' DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum" MAX_FD="maximum"

18
Plan/gradlew.bat vendored
View File

@ -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 @if "%DEBUG%" == "" @echo off
@rem ########################################################################## @rem ##########################################################################
@rem @rem
@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% 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. @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" set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe @rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome if defined JAVA_HOME goto findJavaFromJavaHome

View File

@ -1,5 +1,5 @@
set -e set -e
cd $TRAVIS_BUILD_DIR/Plan cd $TRAVIS_BUILD_DIR/Plan
gradle checkstyleMain ./gradlew checkstyleMain
gradle checkstyleTest ./gradlew checkstyleTest
cd $HOME cd $HOME

View File

@ -1,4 +1,4 @@
set -e set -e
cd $TRAVIS_BUILD_DIR/Plan cd $TRAVIS_BUILD_DIR/Plan
gradle test --info ./gradlew test --info
cd $HOME cd $HOME

View File

@ -1,6 +1,6 @@
set -e set -e
cd $TRAVIS_BUILD_DIR/Plan cd $TRAVIS_BUILD_DIR/Plan
if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
gradle sonarqube ./gradlew sonarqube
fi fi
cd $HOME cd $HOME