From 3d599ce098e0be988de02d213b4810907a94f102 Mon Sep 17 00:00:00 2001 From: Ross Golder Date: Tue, 6 Oct 2026 15:47:52 +0700 Subject: [PATCH] Set abortOnError=true and clean up related lint note (#98) - Change `abortOnError = true` in build.gradle so lint errors now fail the build. - Update the note in pr-check.yml to reflect the new behaviour. - Fix the DiffUtilEquals lint error in LogAdapter (use .equals() for enum comparison in areContentsTheSame). This addresses the long-standing "lint never gates CI" item. Closes #98 --- .github/workflows/pr-check.yml | 2 +- sms2webhook/build.gradle | 2 +- .../src/main/java/org/golder/sms2webhook/LogAdapter.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index 5b70a12..3b14733 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -44,7 +44,7 @@ jobs: uses: ./.github/actions/summarise-lint with: report-path: ${{ env.MODULE }}/build/reports/lint-results-debug.xml - note: Lint is configured with abortOnError false, so these do not block the pull request. + note: Lint errors now fail the build (abortOnError=true). - name: APK size check run: | diff --git a/sms2webhook/build.gradle b/sms2webhook/build.gradle index 6c6ca64..2a2bb7c 100644 --- a/sms2webhook/build.gradle +++ b/sms2webhook/build.gradle @@ -97,7 +97,7 @@ android { } lint { - abortOnError = false + abortOnError = true } namespace = 'org.golder.sms2webhook' diff --git a/sms2webhook/src/main/java/org/golder/sms2webhook/LogAdapter.java b/sms2webhook/src/main/java/org/golder/sms2webhook/LogAdapter.java index 91d6b89..dc652a8 100644 --- a/sms2webhook/src/main/java/org/golder/sms2webhook/LogAdapter.java +++ b/sms2webhook/src/main/java/org/golder/sms2webhook/LogAdapter.java @@ -29,7 +29,7 @@ public boolean areItemsTheSame(@NonNull MainViewModel.LogEntry oldItem, @NonNull @Override public boolean areContentsTheSame(@NonNull MainViewModel.LogEntry oldItem, @NonNull MainViewModel.LogEntry newItem) { - return oldItem.type == newItem.type; + return oldItem.type.equals(newItem.type); } }); this.context = context;