Skip to content

Commit

Permalink
Revert "Set wrapper client and daemon memory differently"
Browse files Browse the repository at this point in the history
Looks like the nightly wrapper promotion job ran out of permGen with
this change.

This reverts commit 1b4f303.
  • Loading branch information
wolfs committed Mar 12, 2017
1 parent 31c50ad commit 88fcaf9
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion gradle/wrapper.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def wrapperUpdateTask = { name, label ->
}

tasks.withType(Wrapper) {
def jvmOpts = "-Xmx256m -Dorg.gradle.jvmargs=-Xmx1700m -Dfile.encoding=UTF-8"
def jvmOpts = "-Xmx2048m -Dfile.encoding=UTF-8"
inputs.property("jvmOpts", jvmOpts)
doLast {
def optsEnvVar = "DEFAULT_JVM_OPTS"
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Fri Mar 10 09:06:48 CET 2017
#Fri Mar 03 08:34:07 MST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,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="-Xmx256m -Dorg.gradle.jvmargs=-Xmx1700m -Dfile.encoding=UTF-8"
DEFAULT_JVM_OPTS="-Xmx2048m -Dfile.encoding=UTF-8"

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
Expand Down
2 changes: 1 addition & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,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=-Xmx256m -Dorg.gradle.jvmargs=-Xmx1700m -Dfile.encoding=UTF-8
set DEFAULT_JVM_OPTS=-Xmx2048m -Dfile.encoding=UTF-8

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

0 comments on commit 88fcaf9

Please sign in to comment.