Skip to content

Commit 78c62c5

Browse files
ZacSweerstschuchortdev
authored andcommitted
Update KSP to 1.4.30-1.0.0-alpha02
1 parent 4ef88b2 commit 78c62c5

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
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.4.20-dev-experimental-20210120'
2+
ext.ksp_version='1.4.30-1.0.0-alpha02'
33
}
44

55
dependencies {

ksp/src/main/kotlin/com/tschuchort/compiletesting/Ksp.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,16 @@ private val KotlinCompilation.kspCachesDir: File
102102
*/
103103
private class KspTestExtension(
104104
options: KspOptions,
105-
private val processors: List<SymbolProcessor>,
105+
processors: List<SymbolProcessor>,
106106
logger: KSPLogger
107107
) : AbstractKotlinSymbolProcessingExtension(
108108
options = options,
109109
logger = logger,
110110
testMode = false
111111
) {
112-
override fun loadProcessors() = processors
112+
private val loadedProcessors = processors
113+
114+
override fun loadProcessors() = loadedProcessors
113115
}
114116

115117
/**

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import com.google.devtools.ksp.processing.CodeGenerator
44
import com.google.devtools.ksp.processing.KSPLogger
55
import com.google.devtools.ksp.processing.Resolver
66
import com.google.devtools.ksp.processing.SymbolProcessor
7+
import com.google.devtools.ksp.symbol.KSAnnotated
78

89
/**
910
* Helper class to write tests, only used in Ksp Compile Testing tests, not a public API.
@@ -19,6 +20,7 @@ internal open class AbstractTestSymbolProcessor : SymbolProcessor {
1920
this.logger = logger
2021
}
2122

22-
override fun process(resolver: Resolver) {
23+
override fun process(resolver: Resolver): List<KSAnnotated> {
24+
return emptyList()
2325
}
2426
}

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.tschuchort.compiletesting
33
import com.google.devtools.ksp.processing.Dependencies
44
import com.google.devtools.ksp.processing.Resolver
55
import com.google.devtools.ksp.processing.SymbolProcessor
6+
import com.google.devtools.ksp.symbol.KSAnnotated
67
import com.google.devtools.ksp.symbol.KSClassDeclaration
78
import com.nhaarman.mockitokotlin2.any
89
import com.nhaarman.mockitokotlin2.inOrder
@@ -67,7 +68,7 @@ class KspTest {
6768
""".trimIndent()
6869
)
6970
val processor = object : AbstractTestSymbolProcessor() {
70-
override fun process(resolver: Resolver) {
71+
override fun process(resolver: Resolver): List<KSAnnotated> {
7172
val symbols = resolver.getSymbolsWithAnnotation("foo.bar.TestAnnotation")
7273
assertThat(symbols.size).isEqualTo(1)
7374
val klass = symbols.first()
@@ -85,6 +86,7 @@ class KspTest {
8586
class $genClassName() {}
8687
""".trimIndent())
8788
}
89+
return emptyList()
8890
}
8991
}
9092
val result = KotlinCompilation().apply {
@@ -177,13 +179,14 @@ class KspTest {
177179
)
178180
val result = mutableListOf<String>()
179181
val processor = object : AbstractTestSymbolProcessor() {
180-
override fun process(resolver: Resolver) {
182+
override fun process(resolver: Resolver): List<KSAnnotated> {
181183
resolver.getSymbolsWithAnnotation(
182184
SuppressWarnings::class.java.canonicalName
183185
).filterIsInstance<KSClassDeclaration>()
184186
.forEach {
185187
result.add(it.qualifiedName!!.asString())
186188
}
189+
return emptyList()
187190
}
188191
}
189192
val compilation = KotlinCompilation().apply {
@@ -200,7 +203,7 @@ class KspTest {
200203
private val packageName: String,
201204
private val className: String
202205
) : AbstractTestSymbolProcessor() {
203-
override fun process(resolver: Resolver) {
206+
override fun process(resolver: Resolver): List<KSAnnotated> {
204207
super.process(resolver)
205208
codeGenerator.createNewFile(
206209
dependencies = Dependencies.ALL_FILES,
@@ -212,6 +215,7 @@ class KspTest {
212215
class $className() {}
213216
""".trimIndent())
214217
}
218+
return emptyList()
215219
}
216220
}
217221

@@ -231,12 +235,13 @@ class KspTest {
231235
""".trimIndent()
232236
)
233237
val processor = object : AbstractTestSymbolProcessor() {
234-
override fun process(resolver: Resolver) {
238+
override fun process(resolver: Resolver): List<KSAnnotated> {
235239
logger.logging("This is a log message")
236240
logger.info("This is an info message")
237241
logger.warn("This is an warn message")
238242
logger.error("This is an error message")
239243
logger.exception(Throwable("This is a failure"))
244+
return emptyList()
240245
}
241246
}
242247
val result = KotlinCompilation().apply {

0 commit comments

Comments
 (0)