From 9bc2c67219b842392b947959bb1574a3e939dcb2 Mon Sep 17 00:00:00 2001 From: ColtonIdle <31751141+ColtonIdle@users.noreply.github.com> Date: Wed, 26 Feb 2025 10:19:26 -0500 Subject: [PATCH 1/4] Update README.md for android kotlin callouts --- plugin-gradle/README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md index f1dd242a8e..7c067adb73 100644 --- a/plugin-gradle/README.md +++ b/plugin-gradle/README.md @@ -435,6 +435,20 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T - `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java) - `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java) +> [!WARNING] +> The target is usually inferred automatically from the java source sets. However, Spotless cannot automatically detect [android](https://github.com/diffplug/spotless/issues/111) or [java-gradle-plugin](https://github.com/diffplug/spotless/issues/437) sources, but you can fix this easily: +> +> ```gradle +> spotless { +> kotlin { +> target 'src/*/kotlin/**/*.kt' +> target 'src/*/java/**/*.kt' +> } +> kotlinGradle { +> target '**/*.kts' +> } +> ``` + ```gradle spotless { // if you are using build.gradle.kts, instead of 'spotless {' use: // configure { From 60993fdedff91eeebf2ef016893b1ee433811a3f Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Mon, 7 Apr 2025 13:05:19 -0700 Subject: [PATCH 2/4] Fix the Android Kotlin warning and adjust its position. --- plugin-gradle/README.md | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md index 7c067adb73..2067222fbf 100644 --- a/plugin-gradle/README.md +++ b/plugin-gradle/README.md @@ -435,19 +435,6 @@ Groovy-Eclipse formatting errors/warnings lead per default to a build failure. T - `com.diffplug.gradle.spotless.KotlinExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/KotlinExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java) - `com.diffplug.gradle.spotless.KotlinGradleExtension` [javadoc](https://javadoc.io/doc/com.diffplug.spotless/spotless-plugin-gradle/7.0.2/com/diffplug/gradle/spotless/KotlinGradleExtension.html), [code](https://github.com/diffplug/spotless/blob/main/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java) -> [!WARNING] -> The target is usually inferred automatically from the java source sets. However, Spotless cannot automatically detect [android](https://github.com/diffplug/spotless/issues/111) or [java-gradle-plugin](https://github.com/diffplug/spotless/issues/437) sources, but you can fix this easily: -> -> ```gradle -> spotless { -> kotlin { -> target 'src/*/kotlin/**/*.kt' -> target 'src/*/java/**/*.kt' -> } -> kotlinGradle { -> target '**/*.kts' -> } -> ``` ```gradle spotless { // if you are using build.gradle.kts, instead of 'spotless {' use: @@ -467,6 +454,16 @@ spotless { // if you are using build.gradle.kts, instead of 'spotless {' use: } ``` +> [!WARNING] +> The target is usually inferred automatically from the java source sets. However, Spotless cannot automatically detect [android](https://github.com/diffplug/spotless/issues/111) or [java-gradle-plugin](https://github.com/diffplug/spotless/issues/437) sources, but you can fix this easily: +> +> ```gradle +> spotless { +> kotlin { +> target 'src/*/kotlin/**/*.kt', 'src/*/java/**/*.kt' +> ... +> ``` + ### ktfmt [homepage](https://github.com/facebook/ktfmt). [changelog](https://github.com/facebook/ktfmt/releases). From fa3fd1e6cb99a6bb3b2a9c8b262db4666edf6ca7 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Mon, 7 Apr 2025 13:07:04 -0700 Subject: [PATCH 3/4] Add the cool blockquote warning trick to the other Android spot. --- plugin-gradle/README.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md index 2067222fbf..ecd85930fc 100644 --- a/plugin-gradle/README.md +++ b/plugin-gradle/README.md @@ -207,13 +207,14 @@ spotless { -The target is usually inferred automatically from the java source sets. However, Spotless cannot automatically detect [android](https://github.com/diffplug/spotless/issues/111) or [java-gradle-plugin](https://github.com/diffplug/spotless/issues/437) sources, but you can fix this easily: - -```gradle -spotless { - java { - target 'src/*/java/**/*.java' -``` +> [!WARNING] +> The target is usually inferred automatically from the java source sets. However, Spotless cannot automatically detect [android](https://github.com/diffplug/spotless/issues/111) or [java-gradle-plugin](https://github.com/diffplug/spotless/issues/437) sources, but you can fix this easily: +> +> ```gradle +> spotless { +> java { +> target 'src/*/java/**/*.java' +> ``` ### removeUnusedImports From d25f04de3e75030c91962739bc99ea7d377d7678 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Mon, 7 Apr 2025 13:08:28 -0700 Subject: [PATCH 4/4] Minor tweak. --- plugin-gradle/README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md index ecd85930fc..ef7b6be888 100644 --- a/plugin-gradle/README.md +++ b/plugin-gradle/README.md @@ -460,9 +460,8 @@ spotless { // if you are using build.gradle.kts, instead of 'spotless {' use: > > ```gradle > spotless { -> kotlin { -> target 'src/*/kotlin/**/*.kt', 'src/*/java/**/*.kt' -> ... +> kotlin { +> target 'src/*/kotlin/**/*.kt', 'src/*/java/**/*.kt' > ``` ### ktfmt