Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1007a805 authored by Maria Asensio's avatar Maria Asensio
Browse files

Merge pull request #109 from owncloud/target_marshmallow 

Updated build target to Android APIv23
parents 4eb15976 27237576

.travis.yml

+6 −3
Original line number Diff line number Diff line
@@ -2,8 +2,11 @@ sudo: false 
language: android

android:

  components:

  - build-tools-22.0.1

  - android-19

  - platform-tools

  - tools

  - build-tools-23.0.2

  - android-23

  - sys-img-armeabi-v7a-android-23

branches:

  only:

  - master
@@ -33,7 +36,7 @@ env: 
  - secure: AnxLVarfwM7IhJ7Sca35USyRlFHFvlcBhWTt2TVDcyQ+ldDyb+U6IWXFK0Yy82QP0ZH/RCLu7FnmHK/rKG0BHNRt1Ymco1VkTQql0MZcHXP+4IKgEvgJyUn1TqYj+hSVmM6lgTA+QUjZYGSfwU8mhUFiU7644ZTdTe6ALdqa+v8=

  - secure: ezKyZbb3q1Phcv/vJntuJe0C2req+Hp4/C+tFZIWZ3o8wRO9jVI3bnED9TWQyQOOT0SoRYjJ5zqp0UcEOGCzPeWFO6bA7RWp+zA/R9sziLNcVWMVv3WXnuClQjPBHJeXRnP7YmNjxDmSfV97a14dk5d9LgJZYliTDepH4dLsxro=

  matrix:

  - ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a

  - ANDROID_TARGET=android-23 ANDROID_ABI=armeabi-v7a

addons:

  coverity_scan:

    project:

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 


    <uses-sdk

        android:minSdkVersion="8"

        android:targetSdkVersion="19" />

        android:targetSdkVersion="23" />



</manifest>

build.gradle

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ buildscript { 
        mavenCentral()

    }

    dependencies {

        classpath 'com.android.tools.build:gradle:1.2.3'

        classpath 'com.android.tools.build:gradle:1.5.0'

    }

}
@@ -18,8 +18,8 @@ dependencies { 
}



android {

    compileSdkVersion 19

    buildToolsVersion "22.0.1"

    compileSdkVersion 23

    buildToolsVersion "23.0.2"



    sourceSets {

        main {

project.properties

+1 −1
Original line number Diff line number Diff line
@@ -11,5 +11,5 @@ 
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt



# Project target.

target=android-19

target=android-23

android.library=true

sample_client/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
    <uses-permission android:name="android.permission.INTERNET" />

    <uses-sdk

        android:minSdkVersion="8"

        android:targetSdkVersion="19" />

        android:targetSdkVersion="23" />

    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">

        <activity 	android:name="MainActivity"

                  	android:label="@string/app_name"