Merge pull request #56 from google/yaraki/processor-issue

Support incremental KSP build
google · Feb 15, 2024 · f2ca3c0 · f2ca3c0
2 parents 6874cb5 + 498256e
commit f2ca3c0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,7 @@ captures
 .idea/compiler.xml
 .idea/jarRepositories.xml
 .idea/deploymentTargetDropDown.xml
+.idea/deploymentTargetSelector.xml
 .idea/misc.xml
 .idea/androidTestResultsUserPreferences.xml
 .idea/appInsightsSettings.xml

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/app-catalog/app/build.gradle b/app-catalog/app/build.gradle
@@ -77,7 +77,7 @@ dependencies {
     implementation libs.hilt.android
     ksp libs.hilt.compiler
 
-    // Include all available samples dynamically importend in settings.gradle
+    // Include all available samples dynamically imported in settings.gradle
     gradle.ext.samples.each {
         implementation project("$it")
     }

diff --git a/...processor/src/main/java/com/google/android/catalog/framework/processor/SampleProcessor.kt b/...processor/src/main/java/com/google/android/catalog/framework/processor/SampleProcessor.kt
@@ -49,25 +49,26 @@ class SampleProcessor(
     private val visited = mutableListOf<KSAnnotated>()
 
     override fun process(resolver: Resolver): List<KSAnnotated> {
-        val symbols = resolver.getSymbolsWithAnnotation(Sample::class.java.name)
-            .filter {
-                val isValid = it.validate { first, second ->
+        val (validSymbols, invalidSymbols) = resolver
+            .getSymbolsWithAnnotation(Sample::class.java.name)
+            .partition { symbol ->
+                val isValid = symbol.validate { data, declaration ->
                     // Skip checking fields of a class since its causing issues with viewBinding
-                    !(first is KSClassDeclaration && second is KSPropertyDeclaration)
+                    !(data is KSClassDeclaration && declaration is KSPropertyDeclaration)
                 }
                 if (!isValid) {
-                    logger.warn("Annotated sample is not valid ${it.containingFile?.filePath}")
+                    logger.warn("Annotated sample is not valid ${symbol.containingFile?.filePath}")
                 }
-                (it is KSFunctionDeclaration || it is KSClassDeclaration) &&
+                (symbol is KSFunctionDeclaration || symbol is KSClassDeclaration) &&
                     isValid &&
-                    it !in visited &&
-                    !it.isAnnotationPresent(Deprecated::class)
+                    symbol !in visited &&
+                    !symbol.isAnnotationPresent(Deprecated::class)
             }
-        for (symbol in symbols) {
+        for (symbol in validSymbols) {
             symbol.accept(visitor, Unit)
         }
-        visited.addAll(symbols)
+        visited.addAll(validSymbols)
 
-        return symbols.toList()
+        return invalidSymbols
     }
 }
diff --git a/...k/processor/src/main/java/com/google/android/catalog/framework/processor/SampleVisitor.kt b/...k/processor/src/main/java/com/google/android/catalog/framework/processor/SampleVisitor.kt
@@ -38,7 +38,6 @@ internal class SampleVisitor(
     override fun visitClassDeclaration(classDeclaration: KSClassDeclaration, data: Unit) {
         val target = classDeclaration.getAllSuperTypes().firstNotNullOfOrNull {
             val className = it.declaration.qualifiedName?.asString().orEmpty()
-            logger.warn(className)
             when (className) {
                 "android.app.Activity" -> {
                     "targetActivity<${classDeclaration.toFullPath()}>()"
@@ -83,6 +82,7 @@ internal class SampleVisitor(
         val file = codeGenerator.createNewFile(
             dependencies = Dependencies(
                 aggregating = true,
+                functionSample.containingFile!!
             ),
             packageName = packageName,
             fileName = "${sampleFile}Module"