diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index f029a1e..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -CSite \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 508b3d9..7ac24c7 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -11,12 +11,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index c1f6232..561ecd7 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -77,7 +77,7 @@ - + diff --git a/build.gradle b/build.gradle index 8a6c88d..f471545 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:2.2.0-rc2' + classpath 'com.android.tools.build:gradle:2.2.0' // classpath 'com.google.guava:guava:19.0' } } diff --git a/gradle.properties b/gradle.properties index 1d3591c..ab16782 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,17 @@ -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. - +## Project-wide Gradle settings. +# # 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 +# Default value: -Xmx1024m -XX:MaxPermSize=256m # 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 \ No newline at end of file +# org.gradle.parallel=true +#Sat Oct 01 13:53:44 CST 2016 +systemProp.http.proxyHost=127.0.0.1 +systemProp.http.proxyPort=8787