From 0d646233b01affba68b0cb7b193400328e23a5d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Brey?= <alvaro.brey@nextcloud.com>
Date: Fri, 7 Oct 2022 17:42:29 +0200
Subject: [PATCH] Replace ktlint plugin with Spotless
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The original plugin did not check all sourcesets :(

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
---
 app/build.gradle | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9fe968a68b..656bc4907d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,10 +13,13 @@ buildscript {
         classpath "org.jacoco:org.jacoco.core:$jacoco_version"
         classpath "org.jacoco:org.jacoco.report:$jacoco_version"
         classpath "org.jacoco:org.jacoco.agent:$jacoco_version"
-        classpath "org.jlleitschuh.gradle:ktlint-gradle:10.3.0"
     }
 }
 
+plugins {
+    id "com.diffplug.spotless" version "6.11.0"
+}
+
 apply plugin: 'com.android.application'
 
 apply plugin: 'kotlin-android'
@@ -28,7 +31,6 @@ apply plugin: 'com.hiya.jacoco-android'
 apply plugin: 'com.github.spotbugs'
 apply plugin: 'io.gitlab.arturbosch.detekt'
 apply plugin: 'shot'
-apply plugin: "org.jlleitschuh.gradle.ktlint"
 
 println "Gradle uses Java ${Jvm.current()}"
 
@@ -386,6 +388,13 @@ task installGitHooks(type: Copy, group: "development") {
     into "${project.rootDir}/.git/hooks"
 }
 
+spotless {
+    kotlin {
+        target "**/*.kt"
+        ktlint()
+    }
+}
+
 detekt {
     reports {
         xml {