Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Gradle wrapper to 5.6 #232

Merged
merged 3 commits into from
Aug 24, 2019
Merged

Update Gradle wrapper to 5.6 #232

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b318fd
Update Gradle wrapper to 5.6
jianglai Aug 17, 2019
71112af
Upgrade shadowJar to 5.1 and increase JVM heap size
jianglai Aug 23, 2019
73f3b3b
Use Gradle binary on GCS
jianglai Aug 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ plugins {
id 'net.ltgt.apt' version '0.19' apply false
id 'net.ltgt.errorprone' version '0.6.1'
id 'checkstyle'
id 'com.github.johnrengelman.shadow' version '5.0.0'
id 'com.github.johnrengelman.shadow' version '5.1.0'

// NodeJs plugin
id "com.moowork.node" version "1.2.0"
Expand Down Expand Up @@ -162,8 +162,8 @@ subprojects {
attributes 'Main-Class': mainClass
}
zip64 = true
classifier = null
version = null
classifier = ''
archiveVersion = ''
configurations = [project.configurations.runtimeClasspath]
from project.sourceSets.main.output
// Excludes signature files that accompany some dependency jars, like
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
org.gradle.jvmargs=-Xmx1024m
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this the default? Is specifying it necessary?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Somehow it was giving me OOM error when I didn't specify this...

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was apparently wrong, or the posts online I found were wrong. Default is 512 MB apparently

https://docs.gradle.org/current/userguide/build_environment.html#sec:configuring_jvm_memory

mavenUrl=
pluginsUrl=
uploaderDestination=
Expand Down
4 changes: 2 additions & 2 deletions gradle/dependency-locks/buildscript-classpath.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ com.diffplug.gradle.spotless:com.diffplug.gradle.spotless.gradle.plugin:3.18.0
com.diffplug.spotless:spotless-lib-extra:1.18.0
com.diffplug.spotless:spotless-lib:1.18.0
com.diffplug.spotless:spotless-plugin-gradle:3.18.0
com.github.jengelman.gradle.plugins:shadow:5.0.0
com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:5.0.0
com.github.jengelman.gradle.plugins:shadow:5.1.0
com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:5.1.0
com.google.cloud.tools:appengine-gradle-plugin:2.0.1
com.google.cloud.tools:appengine-plugins-core:0.7.5
com.google.code.findbugs:jsr305:3.0.2
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 3 additions & 0 deletions prober/gradle/dependency-locks/buildscript-classpath.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.