From 55de2b7d9796d70c0c2a1a342bd4134ef3be3e13 Mon Sep 17 00:00:00 2001 From: len Date: Sun, 17 Apr 2016 16:58:29 +0200 Subject: [PATCH] Remove gradle properties and fix travis build --- .travis.yml | 2 ++ gradle.properties | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 02195d586e..f0f8e5742c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,3 +24,5 @@ cache: directories: - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ +env: + - GRADLE_OPTS="-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m" \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index c1ac6d22cc..1d3591c8a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,4 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true - -org.gradle.daemon=true -org.gradle.jvmargs=-XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m \ No newline at end of file +# org.gradle.parallel=true \ No newline at end of file