Skip to content

Commit

Permalink
adding extra repo
Browse files Browse the repository at this point in the history
  • Loading branch information
chiara committed Oct 25, 2015
1 parent d11fe05 commit 00ca1a4
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ android:
- android-23
- build-tools-23.0.1
- platform-tools
- tools-23.0.1
- tools
- extra-android-m2repository
before_install:
- export ANDROID_HOME=/usr/local/android-sdk
- export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}
Expand Down
22 changes: 14 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
## This file is automatically generated by Android Studio.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
## Project-wide Gradle settings.
#
# This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Fri Mar 20 16:52:36 GMT 2015
# 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
#
# 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 Aug 24 08:18:24 BST 2015
org.gradle.jvmargs=-XX\:MaxPermSize\=1024m
sdk.dir=/Users/cchiappini/Downloads/android-sdk-macosx

0 comments on commit 00ca1a4

Please sign in to comment.