From f6f30adf2b889f12aba98e9da80537ca7f38e57d Mon Sep 17 00:00:00 2001
From: Matt Silber <matt@jackpocket.com>
Date: Thu, 21 Dec 2023 16:03:12 -0500
Subject: [PATCH] Use reviewdog directly with sarifReport

---
 .github/workflows/android-lint.yml | 18 +++++++++++-------
 scratchoff/build.gradle            |  4 ++++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/android-lint.yml b/.github/workflows/android-lint.yml
index 5bf86a5..9a9344f 100644
--- a/.github/workflows/android-lint.yml
+++ b/.github/workflows/android-lint.yml
@@ -17,6 +17,9 @@ jobs:
           distribution: 'zulu'
           java-version: 17
 
+      - name: Setup reviewdog
+        uses: reviewdog/action-setup@v1.0.6
+
       - name: Cache Gradle Files
         uses: actions/cache@v3.3.2
         with:
@@ -28,10 +31,11 @@ jobs:
       - name: Run Android Lint
         run: ./gradlew scratchoff:lintDebug
 
-      - name: Review Android Lint Results
-        uses: DVDAndroid/action-android-lint@v1.2
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          lint_xml_file: scratchoff/build/reports/lint-results-debug.html
-          reporter: github-pr-review
-          level: warning
\ No newline at end of file
+      - name: Review Lint Results
+        run: |
+          cat scratchoff/build/reports/lint-results-debug.sarif \
+            | reviewdog \
+              -name=android-lint \
+              -f=sarif \
+              -reporter=github-pr-review \
+              -level=warning
\ No newline at end of file
diff --git a/scratchoff/build.gradle b/scratchoff/build.gradle
index 76de64a..1a866e2 100644
--- a/scratchoff/build.gradle
+++ b/scratchoff/build.gradle
@@ -31,6 +31,10 @@ android {
         }
     }
 
+    lintOptions {
+        sarifReport true
+    }
+
     publishing {
         singleVariant('release') {
             withSourcesJar()