Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update plugin com.google.devtools.ksp to v1.9.21-1.0.16 #220

Merged
merged 3 commits into from
Dec 15, 2023
Merged

Update plugin com.google.devtools.ksp to v1.9.21-1.0.16 #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c1b0b1
Update plugin com.google.devtools.ksp to v1.9.21-1.0.16
renovate[bot] Dec 14, 2023
bb2a751
Adapt the plugin to work with KSP 1.9.21
renovate[bot] Dec 14, 2023
b81df07
Update changelog
cortinico Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 6 additions & 0 deletions example-kmp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ plugins {
}

kotlin {
jvmToolchain(17)
jvm()
androidTarget()
}
Expand All @@ -21,3 +22,8 @@ android {
tasks.withType<Test> {
useJUnitPlatform()
}

dependencies {
testImplementation(platform(libs.junit.bom))
testImplementation(libs.jupiter)
}
6 changes: 5 additions & 1 deletion example/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
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"
}

ktfmt {
kotlinLangStyle()
}

kotlin {
jvmToolchain(17)
}

dependencies {
testImplementation(platform(libs.junit.bom))
testImplementation(libs.jupiter)
Expand Down
6 changes: 4 additions & 2 deletions plugin-build/plugin/src/main/java/com/ncorti/ktfmt/gradle/KtfmtPluginUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()
Expand Down