Skip to content

Commit 080dfd4

Browse files
Update ksp to v2.0.21-1.0.26 (#2407)
* Update ksp to v2.0.21-1.0.26 * Update the KSP build to fit in better --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jake Wharton <[email protected]>
1 parent 0a7ceab commit 080dfd4

File tree

6 files changed

+37
-12
lines changed

6 files changed

+37
-12
lines changed
+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
3+
4+
import static app.cash.redwood.buildsupport.TargetGroup.Tooling
5+
6+
redwoodBuild {
7+
targets(Tooling)
8+
}
9+
10+
apply plugin: 'com.google.devtools.ksp'
11+
12+
dependencies {
13+
compileOnly(libs.ksp.api)
14+
compileOnly(libs.autoService.annotations)
15+
ksp(libs.autoService.kspCompiler)
16+
}
17+
18+
tasks.withType(JavaCompile).configureEach {
19+
sourceCompatibility = JavaVersion.VERSION_11.toString()
20+
targetCompatibility = JavaVersion.VERSION_11.toString()
21+
}
22+
23+
tasks.withType(KotlinJvmCompile).configureEach {
24+
compilerOptions {
25+
jvmTarget.set(JvmTarget.JVM_11)
26+
}
27+
}

build-support-ksp-processor/build.gradle.kts

-7
This file was deleted.

build-support-ksp-processor/src/main/kotlin/app/cash/redwood/buildsupportksp/RedwoodSymbolProcessorProvider.kt

+2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515
*/
1616
package app.cash.redwood.buildsupportksp
1717

18+
import com.google.auto.service.AutoService
1819
import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
1920
import com.google.devtools.ksp.processing.SymbolProcessorProvider
2021

22+
@AutoService(SymbolProcessorProvider::class)
2123
class RedwoodSymbolProcessorProvider : SymbolProcessorProvider {
2224
override fun create(environment: SymbolProcessorEnvironment) =
2325
RedwoodSymbolProcessor(environment)

build-support-ksp-processor/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider

-1
This file was deleted.

build-support/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ apply plugin: 'com.android.lint'
2828
dependencies {
2929
compileOnly gradleApi()
3030
implementation libs.kotlin.gradlePlugin
31-
implementation libs.kotlin.kspGradlePlugin
31+
implementation libs.ksp.gradlePlugin
3232
implementation libs.gradleMavenPublishPlugin
3333
implementation libs.dokkaPlugin
3434
implementation libs.spotlessPlugin

gradle/libs.versions.toml

+7-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kotlinx-serialization = "1.7.3"
55
androidx-activity = "1.9.3"
66
androidx-compose-ui = "1.7.4"
77
jbCompose = "1.7.0"
8-
ksp = "2.0.21-1.0.25"
8+
ksp = "2.0.21-1.0.26"
99
lint = "31.7.1"
1010
paparazzi = "1.3.2"
1111
zipline = "1.17.0"
@@ -18,8 +18,6 @@ kotlin-compiler = { module = "org.jetbrains.kotlin:kotlin-compiler", version.ref
1818
kotlin-compilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
1919
kotlin-composePlugin = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
2020
kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
21-
kotlin-kspApi = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
22-
kotlin-kspGradlePlugin = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }
2321
kotlin-serializationPlugin = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
2422
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
2523
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
@@ -35,6 +33,9 @@ kotlinx-binaryCompatibilityValidator = "org.jetbrains.kotlinx:binary-compatibili
3533
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
3634
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
3735

36+
ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
37+
ksp-gradlePlugin = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }
38+
3839
xmlutil-serialization = 'io.github.pdvrieze.xmlutil:serialization:0.90.2'
3940

4041
atomicFuPlugin = "org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.26.0"
@@ -57,6 +58,9 @@ androidx-test-uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"
5758

5859
androidx-gradlePluginLints = "androidx.lint:lint-gradle:1.0.0-alpha02"
5960

61+
autoService-annotations = "com.google.auto.service:auto-service-annotations:1.1.1"
62+
autoService-kspCompiler = "dev.zacsweers.autoservice:auto-service-ksp:1.2.0"
63+
6064
google-material = { module = "com.google.android.material:material", version = "1.12.0" }
6165

6266
jetbrains-compose-collection = { module = "org.jetbrains.compose.collection-internal:collection", version.ref = "jbCompose" }

0 commit comments

Comments
 (0)