mirror of
				https://github.com/owncloud/android-library.git
				synced 2025-11-03 20:08:00 +00:00 
			
		
		
		
	Merge pull request #179 from owncloud/migrate_android_o
Migrate to Android O
This commit is contained in:
		
						commit
						c18329efd6
					
				@ -10,7 +10,7 @@ install:
 | 
			
		||||
- yes | sdkmanager --verbose "build-tools;26.0.2"
 | 
			
		||||
- yes | sdkmanager --verbose "platform-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"
 | 
			
		||||
 | 
			
		||||
# Check tools and dependencies installed
 | 
			
		||||
@ -43,7 +43,7 @@ env:
 | 
			
		||||
  #   via the "travis encrypt" command using the project repo's public key
 | 
			
		||||
  - secure: epTZ0zZGDbHL3o6vSC9uNkZsi5j5SA6O/tvQBH7QW/dluuzIJxIjfhNbZHDyBReYDleirLzUFQpdWAUdvulCMLs/qZdIzFGlYXZSpxEnvPYMGQcilwADdJcxLw8L+3+ET5hSexxhjrTGw427IljkqGUpqQTxaLwFdFu98lDWSbc=
 | 
			
		||||
  matrix:
 | 
			
		||||
  - ANDROID_TARGET=android-24 ANDROID_ABI=armeabi-v7a
 | 
			
		||||
  - ANDROID_TARGET=android-26 ANDROID_ABI=armeabi-v7a
 | 
			
		||||
addons:
 | 
			
		||||
  coverity_scan:
 | 
			
		||||
    project:
 | 
			
		||||
 | 
			
		||||
@ -35,7 +35,7 @@
 | 
			
		||||
 | 
			
		||||
    <uses-sdk
 | 
			
		||||
        android:minSdkVersion="8"
 | 
			
		||||
        android:targetSdkVersion="24" />
 | 
			
		||||
        android:targetSdkVersion="26" />
 | 
			
		||||
 | 
			
		||||
</manifest>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -18,7 +18,7 @@ dependencies {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
android {
 | 
			
		||||
    compileSdkVersion 24
 | 
			
		||||
    compileSdkVersion 26
 | 
			
		||||
    buildToolsVersion '26.0.2'
 | 
			
		||||
 | 
			
		||||
    sourceSets {
 | 
			
		||||
 | 
			
		||||
@ -30,7 +30,7 @@
 | 
			
		||||
    <uses-permission android:name="android.permission.INTERNET" />
 | 
			
		||||
    <uses-sdk
 | 
			
		||||
        android:minSdkVersion="8"
 | 
			
		||||
        android:targetSdkVersion="24" />
 | 
			
		||||
        android:targetSdkVersion="26" />
 | 
			
		||||
    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
 | 
			
		||||
        <activity 	android:name="MainActivity"
 | 
			
		||||
                  	android:label="@string/app_name"
 | 
			
		||||
 | 
			
		||||
@ -9,7 +9,7 @@ dependencies {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
android {
 | 
			
		||||
    compileSdkVersion 24
 | 
			
		||||
    compileSdkVersion 26
 | 
			
		||||
    buildToolsVersion "26.0.2"
 | 
			
		||||
 | 
			
		||||
    sourceSets {
 | 
			
		||||
 | 
			
		||||
@ -39,7 +39,7 @@
 | 
			
		||||
 | 
			
		||||
	<uses-sdk
 | 
			
		||||
        android:minSdkVersion="8"
 | 
			
		||||
        android:targetSdkVersion="24" />
 | 
			
		||||
        android:targetSdkVersion="26" />
 | 
			
		||||
 | 
			
		||||
    <application
 | 
			
		||||
        android:allowBackup="true"
 | 
			
		||||
 | 
			
		||||
@ -11,7 +11,7 @@ dependencies {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
android {
 | 
			
		||||
    compileSdkVersion 24
 | 
			
		||||
    compileSdkVersion 26
 | 
			
		||||
    buildToolsVersion "26.0.2"
 | 
			
		||||
 | 
			
		||||
    sourceSets {
 | 
			
		||||
 | 
			
		||||
@ -6,7 +6,7 @@ dependencies {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
android {
 | 
			
		||||
    compileSdkVersion 24
 | 
			
		||||
    compileSdkVersion 26
 | 
			
		||||
    buildToolsVersion "26.0.2"
 | 
			
		||||
 | 
			
		||||
    sourceSets {
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user