From 23428c3a16f18dacd829ad45d0b53b6775830bf5 Mon Sep 17 00:00:00 2001 From: JohnnySun Date: Wed, 14 Sep 2016 07:28:06 +0800 Subject: [PATCH] Rollback gradle.properties --- gradle.properties | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1eed47e8..8c144972 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,19 +1,19 @@ -## Project-wide Gradle settings. -# +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + # For more details on how to configure your build environment visit # http://www.gradle.org/docs/current/userguide/build_environment.html -# + # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. # Default value: -Xmx10248m -XX:MaxPermSize=256m # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -# +org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 + # 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 -#Mon Sep 12 23:20:41 CST 2016 -systemProp.http.proxyHost=127.0.0.1 -systemProp.http.nonProxyHosts=192.168.*, 127.0.0.1, localhost -org.gradle.jvmargs=-Xmx2048m -XX\:MaxPermSize\=512m -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8 -systemProp.http.proxyPort=1080 +# org.gradle.parallel=true \ No newline at end of file