flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #179 from owncloud/migrate_android_o

Browse Source 
Migrate to Android O
This commit is contained in:
David González Verdugo 2017-10-30 10:44:53 +01:00 committed by GitHub
commit c18329efd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -10,7 +10,7 @@ install:
- yes | sdkmanager --verbose "build-tools;26.0.2" - yes | sdkmanager --verbose "build-tools;26.0.2"
- yes | sdkmanager --verbose "platform-tools" - yes | sdkmanager --verbose "platform-tools"
- yes | sdkmanager --verbose "tools" - yes | sdkmanager --verbose "tools"
- yes | sdkmanager --verbose "platforms;android-24" - yes | sdkmanager --verbose "platforms;android-26"
- yes | sdkmanager --verbose "system-images;android-24;default;armeabi-v7a" - yes | sdkmanager --verbose "system-images;android-24;default;armeabi-v7a"
# Check tools and dependencies installed # Check tools and dependencies installed
@ -43,7 +43,7 @@ env:
# via the "travis encrypt" command using the project repo's public key # via the "travis encrypt" command using the project repo's public key
- secure: epTZ0zZGDbHL3o6vSC9uNkZsi5j5SA6O/tvQBH7QW/dluuzIJxIjfhNbZHDyBReYDleirLzUFQpdWAUdvulCMLs/qZdIzFGlYXZSpxEnvPYMGQcilwADdJcxLw8L+3+ET5hSexxhjrTGw427IljkqGUpqQTxaLwFdFu98lDWSbc= - secure: epTZ0zZGDbHL3o6vSC9uNkZsi5j5SA6O/tvQBH7QW/dluuzIJxIjfhNbZHDyBReYDleirLzUFQpdWAUdvulCMLs/qZdIzFGlYXZSpxEnvPYMGQcilwADdJcxLw8L+3+ET5hSexxhjrTGw427IljkqGUpqQTxaLwFdFu98lDWSbc=
matrix: matrix:
- ANDROID_TARGET=android-24 ANDROID_ABI=armeabi-v7a - ANDROID_TARGET=android-26 ANDROID_ABI=armeabi-v7a
addons: addons:
coverity_scan: coverity_scan:
project: project:

2
AndroidManifest.xml
View File

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

2
build.gradle
View File

@ -18,7 +18,7 @@ dependencies {
} }
android { android {
compileSdkVersion 24 compileSdkVersion 26
buildToolsVersion '26.0.2' buildToolsVersion '26.0.2'
sourceSets { sourceSets {

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="24" /> android:targetSdkVersion="26" />
<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"

2
sample_client/build.gradle
View File

@ -9,7 +9,7 @@ dependencies {
} }
android { android {
compileSdkVersion 24 compileSdkVersion 26
buildToolsVersion "26.0.2" buildToolsVersion "26.0.2"
sourceSets { sourceSets {

2
test_client/AndroidManifest.xml
View File

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

2
test_client/build.gradle
View File

@ -11,7 +11,7 @@ dependencies {
} }
android { android {
compileSdkVersion 24 compileSdkVersion 26
buildToolsVersion "26.0.2" buildToolsVersion "26.0.2"
sourceSets { sourceSets {

2
test_client/tests/build.gradle
View File

@ -6,7 +6,7 @@ dependencies {
} }
android { android {
compileSdkVersion 24 compileSdkVersion 26
buildToolsVersion "26.0.2" buildToolsVersion "26.0.2"
sourceSets { sourceSets {