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

Unverified Commit 18f75d42 authored by AndyScherzinger's avatar AndyScherzinger
Browse files

bruing versions en par with app master

parent d532c6f4

.drone.yml

+1 −1
Original line number Diff line number Diff line 
pipeline:

  test:

    image: nextcloudci/android:android-7

    image: nextcloudci/android:android-15

    commands:

      - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI -c 20M

      - emulator -avd test -no-window &

build.gradle

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

    }

    dependencies {

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

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

        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'

    }

}
@@ -26,7 +26,7 @@ dependencies { 
}



android {

    compileSdkVersion 24

    compileSdkVersion 25

    buildToolsVersion '25.0.0'



    sourceSets {

sample_client/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ dependencies { 
}



android {

    compileSdkVersion 24

    compileSdkVersion 25

    buildToolsVersion '25.0.0'



    sourceSets {

sample_client/gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME 
distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

test_client/build.gradle

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

    }

    dependencies {

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

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

    }

}
@@ -20,7 +20,7 @@ dependencies { 
}



android {

    compileSdkVersion 24

    compileSdkVersion 25

    buildToolsVersion '25.0.0'



    sourceSets {