Merge pull request #73 from DroidsOnRoids/agp

DroidsOnRoids · Jan 15, 2023 · 6d14b7e · 6d14b7e
2 parents 3bcac8f + aebef4a
commit 6d14b7e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -25,7 +25,7 @@ object Dependencies {
     const val deviceNames = "com.jaredrummler:android-device-names:2.1.0"
     const val debugDb = "com.github.amitshekhariitbhu.Android-Debug-Database:debug-db:1.0.6"
     const val multidex = "androidx.multidex:multidex:2.0.1"
-    const val androidGradlePlugin = "com.android.tools.build:gradle:7.3.1"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:7.4.0"
     const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
     const val publishGradlePlugin = "com.vanniktech:gradle-maven-publish-plugin:0.22.0"
     const val okHttpBom = "com.squareup.okhttp3:okhttp-bom:4.10.0"

diff --git a/chucker_plugin/src/main/res/layout/foqa_chucker_menu_item.xml b/chucker_plugin/src/main/res/layout/foqa_chucker_menu_item.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/selectableItemBackground"
-    android:drawableStart="@drawable/foqa_ic_perm_scan_wifi"
     android:drawablePadding="28dp"
     android:gravity="center_vertical|start"
     android:minHeight="131dp"
     android:orientation="horizontal"
     android:padding="@dimen/hype_plugin_padding"
     android:text="@string/foqa_chucker_plugin_name"
     android:textColor="@color/hype_plugin_color_selector"
-    android:textSize="16sp" />
+    android:textSize="16sp"
+    app:drawableStartCompat="@drawable/foqa_ic_perm_scan_wifi" />
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -15,6 +15,7 @@ android {
     lint {
         checkDependencies = true
         xmlOutput = rootProject.file("build/reports/lint/lint-results.xml")
+        baseline = file("lint-baseline.xml")
     }
 
     buildTypes {

diff --git a/sample/lint-baseline.xml b/sample/lint-baseline.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 7.4.0" type="baseline" client="gradle" dependencies="true" name="AGP (7.4.0)" variant="all" version="7.4.0">
+
+    <issue
+        id="NotificationPermission"
+        message="When targeting Android 13 or higher, posting a permission requires holding the `POST_NOTIFICATIONS` permission (usage from com.chuckerteam.chucker.internal.support.NotificationHelper)">
+        <location
+            file="src/main/AndroidManifest.xml"/>
+    </issue>
+
+</issues>