Skip to content

Commit

Permalink
Update Gradle to 5.6.2 (#1510)
Browse files Browse the repository at this point in the history
Co-authored-by: Kevin Wittek <kevin.wittek@groovy-coder.com>
Co-authored-by: Richard North <rich.north@gmail.com>
  • Loading branch information
3 people committed Oct 4, 2019
1 parent 5aa389a commit a9aa07c
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 10 deletions.
7 changes: 5 additions & 2 deletions build.gradle
@@ -1,8 +1,8 @@
plugins {
id 'com.gradle.build-scan' version '1.16'
id 'com.gradle.build-scan' version '2.4.2'
id 'io.franzbecker.gradle-lombok' version '3.1.0'
id 'nebula.provided-base' version '3.0.3'
id 'com.github.johnrengelman.shadow' version '2.0.2'
id 'com.github.johnrengelman.shadow' version '5.1.0'
id "com.jfrog.bintray" version "1.8.4" apply false
}

Expand Down Expand Up @@ -32,6 +32,9 @@ subprojects {
args(srcDir, "-d", outputDir)
}
}
delombok.onlyIf {
project.sourceSets.main.java.srcDirs.find { it.exists() }
}

repositories {
jcenter()
Expand Down
1 change: 1 addition & 0 deletions core/build.gradle
Expand Up @@ -119,6 +119,7 @@ dependencies {
testCompile project(':test-support')

jarFileTestCompileOnly "org.projectlombok:lombok:${lombok.version}"
jarFileTestAnnotationProcessor "org.projectlombok:lombok:${lombok.version}"
jarFileTestCompile 'junit:junit:4.12'
jarFileTestCompile 'org.assertj:assertj-core:3.12.2'
jarFileTestCompile 'org.ow2.asm:asm-debug-all:5.2'
Expand Down
3 changes: 2 additions & 1 deletion examples/disque-job-queue/build.gradle
Expand Up @@ -7,7 +7,8 @@ repositories {
}

dependencies {
compileOnly 'org.projectlombok:lombok:1.18.10'
compileOnly "org.projectlombok:lombok:1.18.10"
annotationProcessor "org.projectlombok:lombok:1.18.10"
implementation 'biz.paluch.redis:spinach:0.3'
implementation 'com.google.code.gson:gson:2.8.5'
implementation 'com.google.guava:guava:23.0'
Expand Down
3 changes: 2 additions & 1 deletion examples/spring-boot/build.gradle
Expand Up @@ -9,7 +9,8 @@ repositories {
}

dependencies {
compileOnly 'org.projectlombok:lombok:1.18.10'
compileOnly "org.projectlombok:lombok:1.18.10"
annotationProcessor "org.projectlombok:lombok:1.18.10"
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-data-redis'
implementation 'org.springframework.boot:spring-boot-starter-web'
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
#Wed Jan 16 08:01:33 GMT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
22 changes: 19 additions & 3 deletions 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
#
# https://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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -109,8 +125,8 @@ if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
Expand Down
18 changes: 17 additions & 1 deletion 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 https://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
Expand All @@ -14,7 +30,7 @@ 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=
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
Expand Down

0 comments on commit a9aa07c

Please sign in to comment.