Skip to content

Commit 8526582

Browse files
committed
[Java] Upgrade to Gradle 5.2.1 and Shadow 5.0.0.
1 parent f85b09b commit 8526582

File tree

6 files changed

+6
-7
lines changed

6 files changed

+6
-7
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ buildscript {
2121

2222
plugins {
2323
id 'java'
24-
id 'com.github.johnrengelman.shadow' version '4.0.4' apply false
24+
id 'com.github.johnrengelman.shadow' version '5.0.0' apply false
2525
id "io.freefair.javadoc-links" version "3.1.4"
2626
}
2727

@@ -119,7 +119,7 @@ subprojects {
119119
apply plugin: 'checkstyle'
120120
apply plugin: 'eclipse'
121121
apply plugin: 'io.freefair.javadoc-links'
122-
122+
123123
group = sbeGroup
124124
version = sbeVersion
125125

@@ -762,6 +762,6 @@ task uploadToMavenCentral {
762762
}
763763

764764
wrapper {
765-
gradleVersion = '4.10.3'
765+
gradleVersion = '5.2.1'
766766
distributionType = 'ALL'
767767
}

gradle/wrapper/gradle-wrapper.jar

-987 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ APP_NAME="Gradle"
2828
APP_BASE_NAME=`basename "$0"`
2929

3030
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31-
DEFAULT_JVM_OPTS=""
31+
DEFAULT_JVM_OPTS='"-Xmx64m"'
3232

3333
# Use the maximum available, or set MAX_FD != -1 to use that value.
3434
MAX_FD="maximum"

gradlew.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
1414
set APP_HOME=%DIRNAME%
1515

1616
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17-
set DEFAULT_JVM_OPTS=
17+
set DEFAULT_JVM_OPTS="-Xmx64m"
1818

1919
@rem Find java.exe
2020
if defined JAVA_HOME goto findJavaFromJavaHome

settings.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
include 'sbe-tool', 'sbe-samples', 'sbe-benchmarks', 'sbe-all'
22
rootProject.name = 'sbe'
3-
enableFeaturePreview('IMPROVED_POM_SUPPORT')
43

0 commit comments

Comments
 (0)