aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2022-04-10 22:32:56 +0530
committerGitHub <noreply@github.com>2022-04-10 17:02:56 +0000
commitcf1140374ed143bedca4bfab130aa24394d6b413 (patch)
treef6de15fdb8eef4596d6d9bc9fec59741c4eea479
parent18cff9c1446f80157fdc0efd77030d536c1b7295 (diff)
Misc Gradle cleanups (#1838)
* gradle: swallow android.sdk.channel warnings * gradle: switch LeakCanary to AndroidX Startup variant We already pull in the dependency through AppCompat -> Emoji2 -> Startup so we might as well make use of it.
-rw-r--r--gradle.properties2
-rw-r--r--gradle/libs.versions.toml4
2 files changed, 3 insertions, 3 deletions
diff --git a/gradle.properties b/gradle.properties
index ab9386be..1e3126f9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -53,7 +53,7 @@ android.defaults.buildfeatures.resvalues=false
android.defaults.buildfeatures.shaders=false
# Disable warnings about unsupported features, we know what we're doing
-android.suppressUnsupportedOptionWarnings=android.enableR8.fullMode,android.enableResourceOptimizations,android.nonTransitiveRClass,android.suppressUnsupportedOptionWarnings
+android.suppressUnsupportedOptionWarnings=android.enableR8.fullMode,android.enableResourceOptimizations,android.nonTransitiveRClass,android.suppressUnsupportedOptionWarnings,android.sdk.channel
# Maven publishing
GROUP=com.github.android-password-store
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9a4b70b4..63e949c1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -81,8 +81,8 @@ thirdparty-fastscroll = "me.zhanghai.android.fastscroll:library:1.1.7"
thirdparty-flowbinding-android = { module = "io.github.reactivecircus.flowbinding:flowbinding-android", version.ref = "flowbinding" }
thirdparty-jgit = "org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r"
thirdparty-kotlinResult = "com.michael-bull.kotlin-result:kotlin-result:1.1.14"
-thirdparty-leakcanary = { module = "com.squareup.leakcanary:leakcanary-android", version.ref="leakcanary" }
-thirdparty-plumber = { module = "com.squareup.leakcanary:plumber-android", version.ref="leakcanary" }
+thirdparty-leakcanary = { module = "com.squareup.leakcanary:leakcanary-android-startup", version.ref="leakcanary" }
+thirdparty-plumber = { module = "com.squareup.leakcanary:plumber-android-startup", version.ref="leakcanary" }
thirdparty-logcat = "com.squareup.logcat:logcat:0.1"
thirdparty-modernAndroidPrefs = "de.maxr1998:modernandroidpreferences:2.3.0"
thirdparty-nonfree-googlePlayAuthApiPhone = "com.google.android.gms:play-services-auth-api-phone:18.0.1"