Commit graph

19 commits

Author SHA1 Message Date
Andy Scherzinger
e4d936e837 changes due to code review 2016-03-02 14:34:33 +01:00
Andy Scherzinger
413707272a rebased to master: resolved conflicts (edits from fab implementation) 2016-02-25 19:38:24 +01:00
Andy Scherzinger
9e7a111cd9 adding appcompat design lib in exploded aar structure including adoption in build processes 2016-02-12 12:19:31 +01:00
Andy Scherzinger
288b92c61a marshmallow changes redone 2016-02-12 12:15:46 +01:00
AndyScherzinger
31160d2c4f Bump compile from 16-->22 in order to compile actual appcompat 2015-07-26 23:23:45 +02:00
David A. Velasco
516650d52c Trying different options to update support library project (fixing Travis build) 2015-06-15 13:19:50 +02:00
David A. Velasco
e354f8861e Fixed setup_env.sh 2015-05-26 13:45:35 +02:00
Jorge Antonio Diaz-Benito Soriano
c95722a9b3 Fix Linux setup script 2014-10-28 16:47:28 +01:00
Jorge Antonio Diaz-Benito Soriano
d7d4726929 Merge branch 'gradleWithInternalDependency' of github.com:owncloudChalmers/android into gradleWithInternalDependency
Conflicts:
	setup_env.sh
2014-10-28 16:13:10 +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
MMMarcy
0775b10a04 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-17 14:42:11 +02:00
Luke Owncloud
84c8c96916 small changes for building on Linux 2014-10-12 20:36:34 +02:00
David A. Velasco
de367c009a Updated scrips files to setup environment 2014-01-22 10:16:53 +01:00
David A. Velasco
de2e3aa126 Updated setup scripts to include oc_framework project 2013-11-13 12:06:33 +01:00
David A. Velasco
b3267c409b Added workaround app project to environment setup files 2013-11-04 11:40:07 +01:00
David A. Velasco
ea26174440 Added name to build.xml for ActionBarSherlock and fixed calls to git in Windows 2013-10-28 12:49:28 +01:00
David A. Velasco
a34423d367 Removed problematic target assignation in setup_env.bat, and improved setup of test project to avoid change of folders 2013-10-25 14:50:28 +02:00
Bartek Przybylski
502ef603b7 force update support library for outdated actionbarsherlock library 2012-10-06 11:58:11 +02:00
Bartek Przybylski
7578a726b3 add buildscripts for environment setup and building with ant 2012-06-25 19:46:14 +02:00