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

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

Merge pull request #368 from nextcloud/dependabot/gradle/com.android.tools.build-gradle-7.0.0 

Bump gradle from 4.2.2 to 7.0.0
parents e61632a9 405faf79

.drone.yml

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ name: tests 


steps:

  - name: gplay

    image: nextcloudci/android:android-49

    image: ghcr.io/nextcloud/continuous-integration-androidandroidbase:5

    environment:

      LOG_USERNAME:

        from_secret: LOG_USERNAME
@@ -45,7 +45,7 @@ name: analysis 


steps:

  - name: analysis

    image: nextcloudci/android:android-50

    image: ghcr.io/nextcloud/continuous-integration-androidandroidbase:5

    environment:

      GIT_USERNAME:

        from_secret: GIT_USERNAME

build.gradle

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

    }

    dependencies {

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

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

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

        classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.2'

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.17.1"
@@ -32,7 +31,6 @@ repositories { 
}



apply plugin: 'com.android.library'

apply plugin: 'com.github.dcendents.android-maven'

apply plugin: "com.github.spotbugs"

apply plugin: "io.gitlab.arturbosch.detekt"

gradle/wrapper/gradle-wrapper.properties

+2 −2
Original line number Diff line number Diff line 
#Mon May 10 08:27:34 CEST 2021

#Tue Aug 03 13:14:19 CEST 2021

distributionBase=GRADLE_USER_HOME

distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip

distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip

distributionPath=wrapper/dists

zipStorePath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

lint.xml

+4 −0
Original line number Diff line number Diff line
@@ -5,4 +5,8 @@ 
        <ignore path="**/appcompat-1.2.**/**/lint.jar" />

        <ignore path="**/jetified-annotation-experimental-1.0.**/**/lint.jar" />

    </issue>



    <issue id="UnusedResources">

        <ignore path="**/values-**/strings.xml" />

    </issue>

</lint>

src/main/res/values/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
    <string name="nextcloud_files_api_not_responding_title">Error</string>

    <string name="nextcloud_files_api_not_responding_message">Nextcloud Files app API is not responding. Please report this issue.</string>



    <string name="select_account_unknown_error_toast">Something went wrong. Please try again.</string>

    <string name="sso_canceled">SSO import canceled</string>

    <string name="sso_canceled_message">SSO import was cancelled by user</string>

</resources>