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

Commit 9342d8ff authored by Andy Scherzinger's avatar Andy Scherzinger Committed by GitHub
Browse files

Merge pull request #56 from nextcloud/activities 

Activities
parents b4b87462 9b9f91b4

.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

+4 −3
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'

    }

}
@@ -21,11 +21,12 @@ dependencies { 
    compile 'org.apache.jackrabbit:jackrabbit-webdav:2.12.6'

    compile 'org.parceler:parceler-api:1.1.6'

    annotationProcessor 'org.parceler:parceler:1.1.6'

    compile group: 'com.google.code.gson', name: 'gson', version: '2.8.0'

}



android {

    compileSdkVersion 24

    buildToolsVersion "24.0.2"

    compileSdkVersion 25

    buildToolsVersion '25.0.0'



    sourceSets {

        main {

gradle/wrapper/gradle-wrapper.properties

+2 −2
Original line number Diff line number Diff line 
#Tue Aug 16 10:49:49 CEST 2016

#Mon Mar 27 15:45:10 CST 2017

distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

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

sample_client/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ dependencies { 
}



android {

    compileSdkVersion 24

    buildToolsVersion "24.0.2"

    compileSdkVersion 25

    buildToolsVersion '25.0.0'



    sourceSets {

        main {

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