From fbc390b7143e4dc935b0b7b5089f062122cbc297 Mon Sep 17 00:00:00 2001 From: AJ Jordan Date: Tue, 19 Oct 2021 23:09:54 -0700 Subject: [PATCH] Upgrade to Gradle/Gradle Android plugin 7.x Additionally, enable some more linting (per the Android plugin release notes' recommendation) and fix a lint warning. --- app/build.gradle | 1 + .../aegis/ui/fragments/BackupsPreferencesFragment.java | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9e695549..b7b1df18 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,6 +37,7 @@ android { lintOptions { abortOnError true disable "MissingTranslation" + checkDependencies true } testOptions { diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/BackupsPreferencesFragment.java b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/BackupsPreferencesFragment.java index 551c847a..5504092a 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/BackupsPreferencesFragment.java +++ b/app/src/main/java/com/beemdevelopment/aegis/ui/fragments/BackupsPreferencesFragment.java @@ -103,7 +103,7 @@ public class BackupsPreferencesFragment extends PreferencesFragment { return; } - int flags = data.getFlags() & (Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION); + int flags = Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION; getContext().getContentResolver().takePersistableUriPermission(data.getData(), flags); Preferences prefs = getPreferences(); diff --git a/build.gradle b/build.gradle index 5a6e66f3..6ff58500 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.2' + classpath 'com.android.tools.build:gradle:7.0.3' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.17' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b59b6c22..86d01faf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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-6.8.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip