From efb1eab3273816e6d90fa1e0d65040c930eda5c9 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sun, 11 Oct 2020 05:47:47 -0700
Subject: [PATCH] Silence some warnings

---
 app/build.gradle.kts                                       | 7 +++++++
 .../topjohnwu/magisk/databinding/DataBindingAdapters.kt    | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c06475b97..2ccb0e20c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -74,6 +74,13 @@ val copyUtils = tasks.register("copyUtils", Copy::class) {
 
 tasks["preBuild"]?.dependsOn(copyUtils)
 
+configurations.all {
+    resolutionStrategy {
+        force("org.antlr:antlr4-runtime:4.7.1")
+        force("org.antlr:antlr4-tool:4.7.1")
+    }
+}
+
 dependencies {
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
     implementation(kotlin("stdlib"))
diff --git a/app/src/main/java/com/topjohnwu/magisk/databinding/DataBindingAdapters.kt b/app/src/main/java/com/topjohnwu/magisk/databinding/DataBindingAdapters.kt
index f1fb32263..2e8b37b41 100644
--- a/app/src/main/java/com/topjohnwu/magisk/databinding/DataBindingAdapters.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/databinding/DataBindingAdapters.kt
@@ -200,12 +200,12 @@ fun RecyclerView.setDividers(dividerVertical: Drawable?, dividerHorizontal: Draw
     }
 }
 
-@BindingAdapter("app:icon")
+@BindingAdapter("icon")
 fun Button.setIconRes(res: Int) {
     (this as MaterialButton).setIconResource(res)
 }
 
-@BindingAdapter("app:icon")
+@BindingAdapter("icon")
 fun Button.setIcon(drawable: Drawable) {
     (this as MaterialButton).icon = drawable
 }