From 140583f3916e4672073bfb45d171a3dc6e5c9a44 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 12 Aug 2024 13:49:24 +0200
Subject: [PATCH] Format code with spotless

---
 .github/workflows/ci.yml                      |  2 ++
 build.gradle.kts                              | 27 +++++++++++++++++++
 .../termux/app/extrakeys/ExtraKeysInfo.java   |  4 +--
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0940aa8e..44594891 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,6 +40,8 @@ jobs:
         DIRNAME=upload/termux-debug-apks-"$GITHUB_SHA"
         mkdir -p "$DIRNAME"
         shopt -s globstar; for file in termux-*/**/*.apk; do FILENAME="$(basename "$file")"; cp "$file" "$DIRNAME"/"${FILENAME/.apk/-$GITHUB_SHA.apk}"; done
+    - name: Check formatting (fix with ./gradlew spotlessApply)
+      run: ./gradlew spotlessCheck
     - uses: actions/upload-artifact@v4
       if: matrix.javaVersion == '21'
       with:
diff --git a/build.gradle.kts b/build.gradle.kts
index fe4fef48..f7c0dd7a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,7 @@
+plugins {
+    id("com.diffplug.spotless") version "7.0.0.BETA2" apply false
+}
+
 buildscript {
     repositories {
         mavenCentral()
@@ -18,3 +22,26 @@ allprojects {
         mavenCentral()
     }
 }
+
+allprojects {
+    apply {
+        plugin("com.diffplug.spotless")
+    }
+    configure<com.diffplug.gradle.spotless.SpotlessExtension> {
+        java {
+            target("**/*.java")
+            googleJavaFormat().aosp()
+            trimTrailingWhitespace()
+        }
+        kotlin {
+            target("**/*.kt")
+            ktlint()
+            trimTrailingWhitespace()
+        }
+        kotlinGradle {
+            target("*.gradle.kts")
+            ktlint()
+            trimTrailingWhitespace()
+        }
+    }
+}
diff --git a/termux-app/src/main/java/com/termux/app/extrakeys/ExtraKeysInfo.java b/termux-app/src/main/java/com/termux/app/extrakeys/ExtraKeysInfo.java
index ab0dfa77..28633268 100644
--- a/termux-app/src/main/java/com/termux/app/extrakeys/ExtraKeysInfo.java
+++ b/termux-app/src/main/java/com/termux/app/extrakeys/ExtraKeysInfo.java
@@ -33,7 +33,7 @@
  * For example {display: 'Custom name', ...}.
  *
  * Examples:
- * {@code
+ * <pre>{@code
  * # Empty:
  * []
  *
@@ -58,7 +58,7 @@
  *   {key: KEYBOARD, popup: {macro: "CTRL d", display: exit}}
  * ]]
  *
- * }
+ * }</pre>
  *
  * Aliases are also allowed for the keys that you can pass as {@code extraKeyAliasMap}. Check
  * {@link ExtraKeysConstants#CONTROL_CHARS_ALIASES}.