flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-10-31 02:17:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #130 from owncloud/ChangesForAndroidN

Browse Source 
Target API level 24 (Android N)
This commit is contained in:
David A. Velasco 2016-08-12 12:03:36 +02:00 committed by GitHub
commit 7458e16d62
11 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -1,12 +1,14 @@
sudo: false sudo: false
language: android language: android
jdk:
- oraclejdk8
android: android:
components: components:
- platform-tools - platform-tools
- tools - tools
- build-tools-23.0.3 - build-tools-24.0.0
- android-23 - android-24
- sys-img-armeabi-v7a-android-23 - sys-img-armeabi-v7a-android-24
branches: branches:
only: only:
- master - master
@ -37,7 +39,7 @@ env:
- secure: ezKyZbb3q1Phcv/vJntuJe0C2req+Hp4/C+tFZIWZ3o8wRO9jVI3bnED9TWQyQOOT0SoRYjJ5zqp0UcEOGCzPeWFO6bA7RWp+zA/R9sziLNcVWMVv3WXnuClQjPBHJeXRnP7YmNjxDmSfV97a14dk5d9LgJZYliTDepH4dLsxro= - secure: ezKyZbb3q1Phcv/vJntuJe0C2req+Hp4/C+tFZIWZ3o8wRO9jVI3bnED9TWQyQOOT0SoRYjJ5zqp0UcEOGCzPeWFO6bA7RWp+zA/R9sziLNcVWMVv3WXnuClQjPBHJeXRnP7YmNjxDmSfV97a14dk5d9LgJZYliTDepH4dLsxro=
- secure: HV8REF7bB1i6cBEe4YCZvjgTf6tGiptAPzp9qZXGUH9Lxh6yUjYMXXP8flDaIFcE2JuAakW6P4SPr7/SQ+X4f8/84cNhmU1I+6Y1nG37WvelRHQVslOUDbl1TNUnynYZ+ybkb3BtrQvggCGMdQKvGZXYiggFhN/TWuDo0c7Q2Ro= - secure: HV8REF7bB1i6cBEe4YCZvjgTf6tGiptAPzp9qZXGUH9Lxh6yUjYMXXP8flDaIFcE2JuAakW6P4SPr7/SQ+X4f8/84cNhmU1I+6Y1nG37WvelRHQVslOUDbl1TNUnynYZ+ybkb3BtrQvggCGMdQKvGZXYiggFhN/TWuDo0c7Q2Ro=
matrix: matrix:
- ANDROID_TARGET=android-23 ANDROID_ABI=armeabi-v7a - ANDROID_TARGET=android-24 ANDROID_ABI=armeabi-v7a
addons: addons:
coverity_scan: coverity_scan:
project: project:

2
AndroidManifest.xml
View File

@ -30,7 +30,7 @@
<uses-sdk <uses-sdk
android:minSdkVersion="8" android:minSdkVersion="8"
android:targetSdkVersion="23" /> android:targetSdkVersion="24" />
</manifest> </manifest>

6
build.gradle
View File

@ -3,7 +3,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.1.0' classpath 'com.android.tools.build:gradle:2.1.2'
} }
} }
@ -18,8 +18,8 @@ dependencies {
} }
android { android {
compileSdkVersion 23 compileSdkVersion 24
buildToolsVersion "23.0.3" buildToolsVersion "24.0.0"
sourceSets { sourceSets {
main { main {

2
project.properties
View File

@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target.
target=android-23 target=android-24
android.library=true android.library=true

2
sample_client/AndroidManifest.xml
View File

@ -30,7 +30,7 @@
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-sdk <uses-sdk
android:minSdkVersion="8" android:minSdkVersion="8"
android:targetSdkVersion="23" /> android:targetSdkVersion="24" />
<application android:label="@string/app_name" android:icon="@drawable/ic_launcher"> <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
<activity android:name="MainActivity" <activity android:name="MainActivity"
android:label="@string/app_name" android:label="@string/app_name"

4
sample_client/build.gradle
View File

@ -9,8 +9,8 @@ dependencies {
} }
android { android {
compileSdkVersion 23 compileSdkVersion 24
buildToolsVersion "23.0.3" buildToolsVersion "24.0.0"
sourceSets { sourceSets {
main { main {

2
sample_client/project.properties
View File

@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target.
target=android-23 target=android-24
android.library.reference.1=.. android.library.reference.1=..

2
test_client/AndroidManifest.xml
View File

@ -39,7 +39,7 @@
<uses-sdk <uses-sdk
android:minSdkVersion="8" android:minSdkVersion="8"
android:targetSdkVersion="23" /> android:targetSdkVersion="24" />
<application <application
android:allowBackup="true" android:allowBackup="true"

6
test_client/build.gradle
View File

@ -3,7 +3,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.0.0' classpath 'com.android.tools.build:gradle:2.1.2'
} }
} }
@ -20,8 +20,8 @@ dependencies {
} }
android { android {
compileSdkVersion 23 compileSdkVersion 24
buildToolsVersion "23.0.3" buildToolsVersion "24.0.0"
sourceSets { sourceSets {
main { main {

2
test_client/project.properties
View File

@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target.
target=android-23 target=android-24
android.library.reference.1=.. android.library.reference.1=..

4
test_client/tests/project.properties
View File

@ -10,5 +10,5 @@
# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): # To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target
target=android-23 target=android-24