forked from owncloud/android
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
Showing
28 changed files
with
896 additions
and
97 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,3 @@ | ||
| [submodule "actionbarsherlock"] | ||
| path = actionbarsherlock | ||
| url = git://github.com/JakeWharton/ActionBarSherlock.git | ||
| [submodule "owncloud-android-library"] | ||
| path = owncloud-android-library | ||
| url = git://github.com/owncloud/android-library.git | ||
| url = git://github.com/owncloudChalmers/android-library.git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,16 @@ | ||
| language: android | ||
| android: | ||
| components: | ||
| - platform-tools | ||
| - tools | ||
| - build-tools-20.0.0 | ||
| - android-19 | ||
| - android-17 | ||
| - android-14 | ||
| - extra-android-support | ||
| licenses: | ||
| - 'android-sdk-license-5be876d5' | ||
| - 'android-sdk-license-598b93a6' | ||
|
|
||
| jdk: oraclejdk7 | ||
|
|
||
| before_install: | ||
| - rm pom.xml | ||
| - ./setup_env.sh | ||
|
|
||
| - ./setup_env.sh gradle | ||
| script: | ||
| - ./gradlew clean build | ||
| - ./setup_env.sh ant | ||
| - ant clean | ||
| - ant debug | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule actionbarsherlock
deleted from
9598f2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| buildscript { | ||
| repositories { | ||
| mavenCentral() | ||
| } | ||
| dependencies { | ||
| classpath 'com.android.tools.build:gradle:0.13.0' | ||
| } | ||
| } | ||
|
|
||
| apply plugin: 'com.android.application' | ||
|
|
||
|
|
||
| repositories { | ||
| mavenCentral() | ||
|
|
||
| flatDir { | ||
| dirs 'libs' | ||
| } | ||
| } | ||
|
|
||
| artifacts.add("default", file('libs/actionbarsherlock.aar')) | ||
|
|
||
| dependencies { | ||
| compile name: 'touch-image-view' | ||
| compile 'com.android.support:support-v4:19.1.0' | ||
| compile project('libs/actionbarsherlock_lib') | ||
| compile project(':owncloud-android-library') | ||
| compile 'com.jakewharton:disklrucache:2.0.2' | ||
| } | ||
|
|
||
| android { | ||
| compileSdkVersion 19 | ||
| buildToolsVersion "20.0.0" | ||
| sourceSets { | ||
| main { | ||
| manifest.srcFile 'AndroidManifest.xml' | ||
| java.srcDirs = ['src'] | ||
| resources.srcDirs = ['src'] | ||
| aidl.srcDirs = ['src'] | ||
| renderscript.srcDirs = ['src'] | ||
| res.srcDirs = ['res'] | ||
| assets.srcDirs = ['res'] | ||
| } | ||
|
|
||
| // Move the tests to tests/java, tests/res, etc... | ||
| instrumentTest.setRoot('tests') | ||
|
|
||
| // Move the build types to build-types/<type> | ||
| // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... | ||
| // This moves them out of them default location under src/<type>/... which would | ||
| // conflict with src/ being used by the main source set. | ||
| // Adding new build types or product flavors should be accompanied | ||
| // by a similar customization. | ||
| debug.setRoot('build-types/debug') | ||
| release.setRoot('build-types/release') | ||
| } | ||
|
|
||
| android { | ||
| lintOptions { | ||
| abortOnError false | ||
| } | ||
| } | ||
|
|
||
|
|
||
| compileOptions { | ||
| sourceCompatibility JavaVersion.VERSION_1_7 | ||
| targetCompatibility JavaVersion.VERSION_1_7 | ||
| } | ||
|
|
||
| productFlavors { | ||
| } | ||
|
|
||
| packagingOptions { | ||
| exclude 'META-INF/LICENSE.txt' | ||
| } | ||
| } | ||
|
|
||
|
|
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| #Wed Oct 15 10:45:44 CEST 2014 | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip |
Oops, something went wrong.