From 2c1b0b181026ae8de3a943f81902c5d476779fa8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 14 Dec 2023 20:42:32 +0000
Subject: [PATCH 1/3] Update plugin com.google.devtools.ksp to v1.9.21-1.0.16

---
 example/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example/build.gradle.kts b/example/build.gradle.kts
index 451c3d3..4e0d2d1 100644
--- a/example/build.gradle.kts
+++ b/example/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     kotlin("jvm")
     id("com.ncorti.ktfmt.gradle")
-    id("com.google.devtools.ksp") version "1.9.10-1.0.13"
+    id("com.google.devtools.ksp") version "1.9.21-1.0.16"
     id("app.cash.sqldelight") version "2.0.1"
 }
 

From bb2a751e014f99f16ca1d915df1e2d5da91ecdb6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 14 Dec 2023 20:42:32 +0000
Subject: [PATCH 2/3] Adapt the plugin to work with KSP 1.9.21

---
 example-kmp/build.gradle.kts                                | 6 ++++++
 example/build.gradle.kts                                    | 4 ++++
 .../main/java/com/ncorti/ktfmt/gradle/KtfmtPluginUtils.kt   | 6 ++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/example-kmp/build.gradle.kts b/example-kmp/build.gradle.kts
index 857fdef..d8f5597 100644
--- a/example-kmp/build.gradle.kts
+++ b/example-kmp/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 }
 
 kotlin {
+    jvmToolchain(17)
     jvm()
     androidTarget()
 }
@@ -21,3 +22,8 @@ android {
 tasks.withType<Test> {
     useJUnitPlatform()
 }
+
+dependencies {
+    testImplementation(platform(libs.junit.bom))
+    testImplementation(libs.jupiter)
+}
diff --git a/example/build.gradle.kts b/example/build.gradle.kts
index 4e0d2d1..3f60480 100644
--- a/example/build.gradle.kts
+++ b/example/build.gradle.kts
@@ -9,6 +9,10 @@ ktfmt {
     kotlinLangStyle()
 }
 
+kotlin {
+    jvmToolchain(17)
+}
+
 dependencies {
     testImplementation(platform(libs.junit.bom))
     testImplementation(libs.jupiter)
diff --git a/plugin-build/plugin/src/main/java/com/ncorti/ktfmt/gradle/KtfmtPluginUtils.kt b/plugin-build/plugin/src/main/java/com/ncorti/ktfmt/gradle/KtfmtPluginUtils.kt
index 0b5e01b..69ebc57 100644
--- a/plugin-build/plugin/src/main/java/com/ncorti/ktfmt/gradle/KtfmtPluginUtils.kt
+++ b/plugin-build/plugin/src/main/java/com/ncorti/ktfmt/gradle/KtfmtPluginUtils.kt
@@ -79,10 +79,11 @@ internal object KtfmtPluginUtils {
                 charArray.concatToString()
             }
         val taskName = "$TASK_NAME_CHECK$capitalizedName"
+        val inputDirs = srcDir.toList()
         return project.tasks.register(taskName, KtfmtCheckTask::class.java) {
             it.description =
                 "Run Ktfmt formatter for sourceSet '$name' on project '${project.name}'"
-            it.setSource(srcDir)
+            it.setSource(inputDirs)
             it.setIncludes(KtfmtPlugin.defaultIncludes)
             it.setExcludes(KtfmtPlugin.defaultExcludes)
             it.bean = ktfmtExtension.toBean()
@@ -107,10 +108,11 @@ internal object KtfmtPluginUtils {
                 charArray.concatToString()
             }
         val taskName = "$TASK_NAME_FORMAT$srcSetName"
+        val inputDirs = srcDir.toList()
         return project.tasks.register(taskName, KtfmtFormatTask::class.java) {
             it.description =
                 "Run Ktfmt formatter validation for sourceSet '$name' on project '${project.name}'"
-            it.setSource(srcDir)
+            it.setSource(inputDirs)
             it.setIncludes(KtfmtPlugin.defaultIncludes)
             it.setExcludes(KtfmtPlugin.defaultExcludes)
             it.bean = ktfmtExtension.toBean()

From b81df07140a4b2b9c55a80340693a698c7a1de53 Mon Sep 17 00:00:00 2001
From: Nicola Corti <corti.nico@gmail.com>
Date: Fri, 15 Dec 2023 11:17:38 +0100
Subject: [PATCH 3/3] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3da4328..5590a89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Please add your entries according to this format.
 
 ## Unreleased
 
+- Adapt the plugin to work with KSP 1.9.21
 - Remove legacy `kotlin-compiler-embeddable` dependency to prevent potential Kotlin version conflicts
 - Kotlin to 1.9.21