masensio
fbfb6dee90
Merge remote-tracking branch 'origin/develop' into navigationDrawer_basic
...
Conflicts:
.travis.yml
src/com/owncloud/android/authentication/AuthenticatorActivity.java
2015-06-15 14:07:49 +02:00
masensio
d75cb8d6a0
Fix travis compilation
2015-06-15 13:49:00 +02:00
David A. Velasco
e81b00207f
Removed unneeded dependency
2015-06-15 13:39:01 +02:00
David A. Velasco
e86dc8046e
Prevent updating to last version of platform tools
2015-06-15 13:26:41 +02:00
David A. Velasco
59f69dfa25
Adding binary dependencies for aapt
2015-06-15 13:04:38 +02:00
David A. Velasco
63457041d6
Fixed indentation in .travis.yml
2015-06-15 12:46:48 +02:00
David A. Velasco
fc124a8408
Added Android SDK Platform with API level 16 to Travis build file
2015-06-15 12:45:02 +02:00
David A. Velasco
3ead0b6f6e
Try to enforce newer Android build tools in Travis
2015-05-26 13:54:07 +02:00
David A. Velasco
c20d7ef4ad
Let Gradle out of Travis for the moment - needs additional review
2014-12-02 09:47:02 +01:00
MMMarcy
2cad715525
Commit for the PR
...
The pull request targets:
1) Introduces Gradle support
2) Updates maven support (even thou the apk generated is not
stable)
3) Updates the setup_env.* scripts to support different building
tools
4) Removes non UTF-8 characters
5) Removes switches on R.id entries (not supported anymore from
ADT >= 14)
6) Introduced a binary dependency (.aar) that replace the actionbarsherlock
sub-module
Remainders:
1) Change the sub-module back to the owncloud android library
once the PR will be merge
2014-10-28 16:09:34 +01:00
David A. Velasco
274edb45ed
Build with new Android support in Travis
2014-10-20 13:48:12 +02:00
David A. Velasco
c49a949951
Updated version of build-tools to 20 to satisfy new minimum requirement of platform-tools
2014-06-27 14:50:08 +02:00
David A. Velasco
c62c0e6c25
'set' is not enough, no matter the examples... using 'export'
2014-06-27 14:25:47 +02:00
David A. Velasco
8bdf932ee0
Added new Android licenses to accept through parameter in version 2 of android-sdk-installer
2014-06-27 14:15:04 +02:00
David A. Velasco
3b0cf59ea3
Added 'expect' to fix fulfill dependency on verion-2 of android-sdk-installer
2014-06-27 14:05:02 +02:00
David A. Velasco
330f930b20
Update version of android-skd-installer user
2014-06-27 12:31:54 +02:00
David A. Velasco
8e96e3cc3d
Trying older version of android-sdk-installer
2014-04-08 09:22:10 +02:00
David A. Velasco
f6da58961f
Updated travis script according to update instructions of android-sdk-installer
2014-04-08 09:22:09 +02:00
Thomas Müller
ca6b92cba1
API14 was missing - don't start the emulator for now
2014-03-13 11:29:18 +01:00
Thomas Müller
42cfc93469
move setup_env.sh to before_install
2014-03-13 11:25:47 +01:00
Thomas Müller
f38d4baf33
trying to avoid maven call
2014-03-13 11:22:58 +01:00
Thomas Müller
6b1cab8b28
trying to avoid maven call
2014-03-13 11:06:32 +01:00
Thomas Müller
2e03bef227
Update required APIs
2014-03-13 11:00:51 +01:00
Thomas Müller
0a0cd045a1
Try to fix travis build
2014-01-21 19:32:18 +01:00
Thomas Müller
e18815cc31
use ant to build
2014-01-21 18:07:53 +01:00
Thomas Müller
df218f99b8
Starting off with travis-ci integration based on https://github.com/embarkmobile/android-maven-example/blob/master/.travis.yml
2014-01-21 17:16:57 +01:00
