From c3f85c6569a85ef7f1673958a9f470d7c31ff3aa Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Sat, 13 Jun 2015 19:44:59 -0400 Subject: [PATCH] Install android-22 (again) --- .travis.yml | 1 + gradle.properties | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8f9b2cb..133b2ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ android: components: - platform-tools - tools + - android-22 before_install: - openssl aes-256-cbc -K $encrypted_b017c1e684ac_key -iv $encrypted_b017c1e684ac_iv diff --git a/gradle.properties b/gradle.properties index 8585542..f0e22e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ # 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 @@ -18,4 +18,4 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro # org.gradle.parallel=true # Use the build daemon -org.gradle.daemon=false +#org.gradle.daemon=false \ No newline at end of file