Skip to content

Commit af28423

Browse files
Paul Rybitskyitschuchortdev
authored andcommitted
Update KSP version to beta01
1 parent d654ec7 commit af28423

File tree

3 files changed

+28
-36
lines changed

3 files changed

+28
-36
lines changed

ksp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.ksp_version='1.5.0-1.0.0-alpha10'
2+
ext.ksp_version='1.5.10-1.0.0-beta01'
33
}
44

55
dependencies {

ksp/src/test/kotlin/com/tschuchort/compiletesting/AbstractTestSymbolProcessor.kt

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,13 @@ internal open class AbstractTestSymbolProcessor(
1616

1717
// Would be nice if SymbolProcessorProvider was a fun interface
1818
internal fun processorProviderOf(
19-
body: (
20-
options: Map<String, String>,
21-
kotlinVersion: KotlinVersion,
22-
codeGenerator: CodeGenerator,
23-
logger: KSPLogger
24-
) -> SymbolProcessor
19+
body: (environment: SymbolProcessorEnvironment) -> SymbolProcessor
2520
): SymbolProcessorProvider {
2621
return object : SymbolProcessorProvider {
2722
override fun create(
28-
options: Map<String, String>,
29-
kotlinVersion: KotlinVersion,
30-
codeGenerator: CodeGenerator,
31-
logger: KSPLogger
23+
environment: SymbolProcessorEnvironment
3224
): SymbolProcessor {
33-
return body(options, kotlinVersion, codeGenerator, logger)
25+
return body(environment)
3426
}
3527
}
36-
}
28+
}

ksp/src/test/kotlin/com/tschuchort/compiletesting/KspTest.kt

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class KspTest {
2020
fun failedKspTest() {
2121
val instance = mock<SymbolProcessor>()
2222
val providerInstance = mock<SymbolProcessorProvider>()
23-
`when`(providerInstance.create(any(), any(), any(), any())).thenReturn(instance)
23+
`when`(providerInstance.create(any())).thenReturn(instance)
2424
`when`(instance.process(any())).thenThrow(
2525
RuntimeException("intentional fail")
2626
)
@@ -36,14 +36,14 @@ class KspTest {
3636
fun allProcessorMethodsAreCalled() {
3737
val instance = mock<SymbolProcessor>()
3838
val providerInstance = mock<SymbolProcessorProvider>()
39-
`when`(providerInstance.create(any(), any(), any(), any())).thenReturn(instance)
39+
`when`(providerInstance.create(any())).thenReturn(instance)
4040
val result = KotlinCompilation().apply {
4141
sources = listOf(DUMMY_KOTLIN_SRC)
4242
symbolProcessorProviders = listOf(providerInstance)
4343
}.compile()
4444
assertThat(result.exitCode).isEqualTo(ExitCode.OK)
4545
providerInstance.inOrder {
46-
verify().create(any(), any(), any(), any())
46+
verify().create(any())
4747
}
4848
instance.inOrder {
4949
verify().process(any())
@@ -55,14 +55,14 @@ class KspTest {
5555
fun allProcessorMethodsAreCalledWhenOnlyJavaFilesArePresent() {
5656
val instance = mock<SymbolProcessor>()
5757
val providerInstance = mock<SymbolProcessorProvider>()
58-
`when`(providerInstance.create(any(), any(), any(), any())).thenReturn(instance)
58+
`when`(providerInstance.create(any())).thenReturn(instance)
5959
val result = KotlinCompilation().apply {
6060
sources = listOf(DUMMY_JAVA_SRC)
6161
symbolProcessorProviders = listOf(providerInstance)
6262
}.compile()
6363
assertThat(result.exitCode).isEqualTo(ExitCode.OK)
6464
providerInstance.inOrder {
65-
verify().create(any(), any(), any(), any())
65+
verify().create(any())
6666
}
6767
instance.inOrder {
6868
verify().process(any())
@@ -93,8 +93,8 @@ class KspTest {
9393
)
9494
val result = KotlinCompilation().apply {
9595
sources = listOf(annotation, targetClass)
96-
symbolProcessorProviders = listOf(processorProviderOf { _, _, codeGenerator, logger ->
97-
object : AbstractTestSymbolProcessor(codeGenerator) {
96+
symbolProcessorProviders = listOf(processorProviderOf { env ->
97+
object : AbstractTestSymbolProcessor(env.codeGenerator) {
9898
override fun process(resolver: Resolver): List<KSAnnotated> {
9999
val symbols = resolver.getSymbolsWithAnnotation("foo.bar.TestAnnotation").toList()
100100
if (symbols.isNotEmpty()) {
@@ -138,10 +138,10 @@ class KspTest {
138138
val result = KotlinCompilation().apply {
139139
sources = listOf(source)
140140
symbolProcessorProviders = listOf(
141-
processorProviderOf { _, _, codeGenerator, logger -> ClassGeneratingProcessor(codeGenerator, "generated", "A") },
142-
processorProviderOf { _, _, codeGenerator, logger -> ClassGeneratingProcessor(codeGenerator, "generated", "B") })
141+
processorProviderOf { env -> ClassGeneratingProcessor(env.codeGenerator, "generated", "A") },
142+
processorProviderOf { env -> ClassGeneratingProcessor(env.codeGenerator, "generated", "B") })
143143
symbolProcessorProviders = symbolProcessorProviders +
144-
processorProviderOf { _, _, codeGenerator, logger -> ClassGeneratingProcessor(codeGenerator, "generated", "C") }
144+
processorProviderOf { env -> ClassGeneratingProcessor(env.codeGenerator, "generated", "C") }
145145
}.compile()
146146
assertThat(result.exitCode).isEqualTo(ExitCode.OK)
147147
}
@@ -177,8 +177,8 @@ class KspTest {
177177
fun outputDirectoryContents() {
178178
val compilation = KotlinCompilation().apply {
179179
sources = listOf(DUMMY_KOTLIN_SRC)
180-
symbolProcessorProviders = listOf(processorProviderOf { _, _, codeGenerator, logger ->
181-
ClassGeneratingProcessor(codeGenerator, "generated", "Gen")
180+
symbolProcessorProviders = listOf(processorProviderOf { env ->
181+
ClassGeneratingProcessor(env.codeGenerator, "generated", "Gen")
182182
})
183183
}
184184
val result = compilation.compile()
@@ -210,8 +210,8 @@ class KspTest {
210210
val result = mutableListOf<String>()
211211
val compilation = KotlinCompilation().apply {
212212
sources = listOf(javaSource, kotlinSource)
213-
symbolProcessorProviders += processorProviderOf { _, _, codeGenerator, logger ->
214-
object : AbstractTestSymbolProcessor(codeGenerator) {
213+
symbolProcessorProviders += processorProviderOf { env ->
214+
object : AbstractTestSymbolProcessor(env.codeGenerator) {
215215
override fun process(resolver: Resolver): List<KSAnnotated> {
216216
resolver.getSymbolsWithAnnotation(
217217
SuppressWarnings::class.java.canonicalName
@@ -272,12 +272,12 @@ class KspTest {
272272
)
273273
val result = KotlinCompilation().apply {
274274
sources = listOf(annotation, targetClass)
275-
symbolProcessorProviders = listOf(processorProviderOf { _, _, codeGenerator, logger ->
276-
object : AbstractTestSymbolProcessor(codeGenerator) {
275+
symbolProcessorProviders = listOf(processorProviderOf { env ->
276+
object : AbstractTestSymbolProcessor(env.codeGenerator) {
277277
override fun process(resolver: Resolver): List<KSAnnotated> {
278-
logger.logging("This is a log message")
279-
logger.info("This is an info message")
280-
logger.warn("This is an warn message")
278+
env.logger.logging("This is a log message")
279+
env.logger.info("This is an info message")
280+
env.logger.warn("This is an warn message")
281281
return emptyList()
282282
}
283283
}
@@ -306,11 +306,11 @@ class KspTest {
306306
)
307307
val result = KotlinCompilation().apply {
308308
sources = listOf(annotation, targetClass)
309-
symbolProcessorProviders = listOf(processorProviderOf { _, _, codeGenerator, logger ->
310-
object : AbstractTestSymbolProcessor(codeGenerator) {
309+
symbolProcessorProviders = listOf(processorProviderOf { env ->
310+
object : AbstractTestSymbolProcessor(env.codeGenerator) {
311311
override fun process(resolver: Resolver): List<KSAnnotated> {
312-
logger.error("This is an error message")
313-
logger.exception(Throwable("This is a failure"))
312+
env.logger.error("This is an error message")
313+
env.logger.exception(Throwable("This is a failure"))
314314
return emptyList()
315315
}
316316
}

0 commit comments

Comments
 (0)