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

Unverified Commit 1d0bb6d3 authored by Tobias Kaminsky's avatar Tobias Kaminsky Committed by GitHub
Browse files

Merge pull request #188 from nextcloud/dependabot/gradle/com.android.tools.build-gradle-3.2.1 

Bump gradle from 3.0.0 to 3.2.1
parents 586c0ad5 d85dfa5b

AndroidManifest.xml

+0 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 
    android:versionCode="1"

    android:versionName="1.0.13" >



    <uses-sdk

        android:targetSdkVersion="26"/>



    <uses-permission

        android:maxSdkVersion="22"

build.gradle

+6 −5
Original line number Diff line number Diff line 
buildscript {

    repositories {

        jcenter()

        google()

        jcenter()

    }

    dependencies {

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

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

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

    }

}
@@ -13,12 +13,12 @@ apply plugin: 'com.android.library' 
apply plugin: 'com.github.dcendents.android-maven'



repositories {

    jcenter()

    google()

    jcenter()

}



dependencies {

    compile 'org.apache.jackrabbit:jackrabbit-webdav:2.12.6'

    api 'org.apache.jackrabbit:jackrabbit-webdav:2.12.6'

    implementation 'org.parceler:parceler-api:1.1.11'

    annotationProcessor 'org.parceler:parceler:1.1.9'

    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
@@ -26,7 +26,7 @@ dependencies { 
}



android {

    compileSdkVersion 26

    compileSdkVersion 28



    sourceSets {

        main {
@@ -60,5 +60,6 @@ android { 
    }

    defaultConfig {

        minSdkVersion 14

        targetSdkVersion 28

    }

}

gradle/wrapper/gradle-wrapper.properties

+2 −2
Original line number Diff line number Diff line 
#Tue Nov 14 11:01:51 CET 2017

#Thu Oct 25 12:00:00 CET 2018

distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

sample_client/AndroidManifest.xml

+0 −4
Original line number Diff line number Diff line
@@ -30,10 +30,6 @@ 


    <uses-permission android:name="android.permission.INTERNET"/>



    <uses-sdk

        android:minSdkVersion="14"

        android:targetSdkVersion="26"/>



    <application

        android:icon="@drawable/ic_launcher"

        android:label="@string/app_name">

sample_client/build.gradle

+7 −3
Original line number Diff line number Diff line 
apply plugin: 'com.android.application'



repositories {

    jcenter()

    google()

    jcenter()

}



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



android {

    compileSdkVersion 26

    compileSdkVersion 28



    sourceSets {

        main {
@@ -24,7 +24,7 @@ android { 
        }



        // Move the tests to tests/java, tests/res, etc...

        instrumentTest.setRoot('tests')

        // instrumentTest.setRoot('tests')



        // Move the build types to build-types/<type>

        // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
@@ -43,4 +43,8 @@ android { 
    packagingOptions {

        exclude 'META-INF/LICENSE.txt'

    }

    defaultConfig {

        minSdkVersion 14

        targetSdkVersion 28

    }

}