Fix a bug where kotlin classes are ignored

buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts

@@ -43,4 +43,4 @@ tasks {
 dependencies {
     testImplementation(libs.junit)
     testImplementation(libs.strikt.core)
-}
+}

plugin/build.gradle.kts

@@ -13,6 +13,13 @@ dependencies {
    testImplementation(libs.testkit.junit5)
 }
 
+testkitTests {
+    replaceToken("TESTKIT_PLUGIN_VERSION", libs.versions.testkit.plugin.get())
+    replaceToken("KOTLIN_VERSION", libs.versions.kotlin.get())
+    replaceToken("PROTOKT_VERSION", libs.versions.protokt.get())
+    replaceToken("PROTOBUF_VERSION", libs.versions.protobuf.get())
+}
+
 gradlePlugin {
     plugins {
         create("expediter") {

plugin/src/main/kotlin/com/toasttab/expediter/gradle/ExpediterTask.kt

@@ -33,7 +33,6 @@ import org.gradle.api.GradleException
 import org.gradle.api.artifacts.ArtifactCollection
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.FileCollection
-import org.gradle.api.file.SourceDirectorySet
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.Input
@@ -43,6 +42,7 @@ import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.PathSensitive
 import org.gradle.api.tasks.PathSensitivity
+import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.TaskAction
 import protokt.v1.toasttab.expediter.v1.TypeDescriptors
 import java.io.File
@@ -52,7 +52,7 @@ import java.util.zip.GZIPInputStream
 abstract class ExpediterTask : DefaultTask() {
     private val applicationConfigurationArtifacts = mutableListOf<ArtifactCollection>()
     private val platformConfigurationArtifacts = mutableListOf<ArtifactCollection>()
-    private val applicationSourceSets: MutableSet<SourceDirectorySet> = mutableSetOf()
+    private val applicationSourceSets: MutableSet<SourceSet> = mutableSetOf()
 
     @get:Internal
     abstract val cache: Property<ApplicationTypeCache>
@@ -71,7 +71,7 @@ abstract class ExpediterTask : DefaultTask() {
     @get:PathSensitive(PathSensitivity.RELATIVE)
     @Suppress("UNUSED")
     val sourceSets: FileCollection get() = project.objects.fileCollection().apply {
-        setFrom(applicationSourceSets.map { it.classesDirectory })
+        setFrom(applicationSourceSets.flatMap { it.output })
     }
 
     private fun Collection<ArtifactCollection>.asFileCollection() = if (isEmpty()) {
@@ -92,7 +92,7 @@ abstract class ExpediterTask : DefaultTask() {
         platformConfigurationArtifacts.add(artifactCollection)
     }
 
-    fun sourceSet(sourceDirectorySet: SourceDirectorySet) {
+    fun sourceSet(sourceDirectorySet: SourceSet) {
         applicationSourceSets.add(sourceDirectorySet)
     }
 
@@ -166,6 +166,8 @@ abstract class ExpediterTask : DefaultTask() {
 
         val typeSources = applicationConfigurationArtifacts.sources() + files.sources() + applicationSourceSets.sources()
 
+        logger.info("type sources = {}", typeSources)
+
         val issues = Expediter(
             ignore,
             cache.get().resolve(typeSources),

plugin/src/main/kotlin/com/toasttab/expediter/gradle/Sources.kt

@@ -7,7 +7,7 @@ import org.gradle.api.artifacts.component.ModuleComponentIdentifier
 import org.gradle.api.artifacts.component.ProjectComponentIdentifier
 import org.gradle.api.artifacts.result.ResolvedArtifactResult
 import org.gradle.api.file.ConfigurableFileCollection
-import org.gradle.api.file.SourceDirectorySet
+import org.gradle.api.tasks.SourceSet
 import java.io.File
 
 fun ResolvedArtifactResult.source() =
@@ -19,12 +19,12 @@ fun ResolvedArtifactResult.source() =
 
 fun File.source() = ClassfileSource(this, ClassfileSourceType.UNKNOWN, name)
 
-fun SourceDirectorySet.source() = ClassfileSource(classesDirectory.get().asFile, ClassfileSourceType.SOURCE_SET, name)
+fun SourceSet.sources() = output.map { ClassfileSource(it, ClassfileSourceType.SOURCE_SET, name) }
 
 fun ArtifactCollection.sources() = artifacts.map { it.source() }
 
 fun ConfigurableFileCollection.sources() = map { it.source() }
 
 fun Collection<ArtifactCollection>.sources() = flatMapTo(LinkedHashSet(), ArtifactCollection::sources)
 
-fun Set<SourceDirectorySet>.sources() = map { it.source() }
+fun Set<SourceSet>.sources() = flatMap { it.sources() }

plugin/src/main/kotlin/com/toasttab/expediter/gradle/config/ExpediterExtension.kt

@@ -75,8 +75,10 @@ abstract class ExpediterExtension(
             files.from(file)
         }
 
-        for (sourceSet in spec.sourceSets) {
-            sourceSet(project.sourceSet(sourceSet).java)
+        for (sourceSetName in spec.sourceSets) {
+            val sourceSet = project.sourceSet(sourceSetName)
+            sourceSet(sourceSet)
+            dependsOn(sourceSet.classesTaskName)
         }
     }
 

plugin/src/test/kotlin/com/toasttab/expediter/gradle/ExpediterPluginIntegrationTest.kt

@@ -111,6 +111,54 @@ class ExpediterPluginIntegrationTest {
         )
     }
 
+    @Test
+    fun `kotlin jvm compat`(project: TestProject) {
+        project.createRunner()
+            .withArguments("check")
+            .buildAndFail()
+
+        val report = IssueReport.fromJson(project.dir.resolve("build/expediter.json").readText())
+
+        expectThat(report.issues).contains(
+            Issue.MissingMember(
+                "test/Caller",
+                MemberAccess.MethodAccess(
+                    "java/lang/String",
+                    null,
+                    MemberSymbolicReference(
+                        "isBlank",
+                        "()Z"
+                    ),
+                    MethodAccessType.VIRTUAL
+                )
+            )
+        )
+    }
+
+    @Test
+    fun `protokt android compat`(project: TestProject) {
+        project.createRunner()
+            .withArguments("check")
+            .buildAndFail()
+
+        val report = IssueReport.fromJson(project.dir.resolve("build/expediter.json").readText())
+
+        expectThat(report.issues).contains(
+            Issue.MissingMember(
+                "com/google/protobuf/UnsafeUtil\$JvmMemoryAccessor",
+                MemberAccess.MethodAccess(
+                    "sun/misc/Unsafe",
+                    null,
+                    MemberSymbolicReference(
+                        "getLong",
+                        "(J)J"
+                    ),
+                    MethodAccessType.VIRTUAL
+                )
+            )
+        )
+    }
+
     @Test
     fun `multi check`(project: TestProject) {
         project.createRunner().withArguments("check").build()

plugin/src/test/projects/ExpediterPluginIntegrationTest/android compat source only/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     java
     id("com.toasttab.expediter")
-    id("com.toasttab.testkit.coverage") version "0.0.4"
+    id("com.toasttab.testkit.coverage") version "@TESTKIT_PLUGIN_VERSION@"
 }
 
 repositories {

plugin/src/test/projects/ExpediterPluginIntegrationTest/android compat/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     java
     id("com.toasttab.expediter")
-    id("com.toasttab.testkit.coverage") version "0.0.4"
+    id("com.toasttab.testkit.coverage") version "@TESTKIT_PLUGIN_VERSION@"
 }
 
 repositories {

plugin/src/test/projects/ExpediterPluginIntegrationTest/android lib/build.gradle.kts

@@ -1,9 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     id("com.android.library") version "8.1.2"
-    id("org.jetbrains.kotlin.android") version "1.9.0"
+    id("org.jetbrains.kotlin.android") version "@KOTLIN_VERSION@"
     id("com.toasttab.expediter")
-    id("com.toasttab.testkit.coverage") version "0.0.4"
+    id("com.toasttab.testkit.coverage") version "@TESTKIT_PLUGIN_VERSION@"
 }
 
 expediter {

plugin/src/test/projects/ExpediterPluginIntegrationTest/cross library/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     java
     id("com.toasttab.expediter")
-    id("com.toasttab.testkit.coverage") version "0.0.4"
+    id("com.toasttab.testkit.coverage") version "@TESTKIT_PLUGIN_VERSION@"
 }
 
 repositories {

plugin/src/test/projects/ExpediterPluginIntegrationTest/ignore file/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     java
     id("com.toasttab.expediter")
-    id("com.toasttab.testkit.coverage") version "0.0.4"
+    id("com.toasttab.testkit.coverage") version "@TESTKIT_PLUGIN_VERSION@"
 }
 
 repositories {

plugin/src/test/projects/ExpediterPluginIntegrationTest/ignore/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     java
     id("com.toasttab.expediter")
-    id("com.toasttab.testkit.coverage") version "0.0.4"
+    id("com.toasttab.testkit.coverage") version "@TESTKIT_PLUGIN_VERSION@"
 }
 
 repositories {

plugin/src/test/projects/ExpediterPluginIntegrationTest/jvm compat/build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id 'com.toasttab.expediter'
-    id 'com.toasttab.testkit.coverage' version '0.0.2'
+    id 'com.toasttab.testkit.coverage' version '@TESTKIT_PLUGIN_VERSION@'
 }
 
 repositories {

plugin/src/test/projects/ExpediterPluginIntegrationTest/kotlin jvm compat/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+    kotlin("jvm") version "@KOTLIN_VERSION@"
+    id("com.toasttab.expediter")
+    id("com.toasttab.testkit.coverage") version "@TESTKIT_PLUGIN_VERSION@"
+}
+
+repositories {
+    mavenCentral()
+}
+
+expediter {
+    failOnIssues = true
+
+    platform {
+        jvmVersion = 8
+    }
+}

plugin/src/test/projects/ExpediterPluginIntegrationTest/kotlin jvm compat/settings.gradle.kts

@@ -0,0 +1 @@
+rootProject.name = "test"

plugin/src/test/projects/ExpediterPluginIntegrationTest/kotlin jvm compat/src/main/kotlin/test/Caller.kt

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2023 Toast Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package test
+class Caller {
+    fun f(s: java.lang.String) {
+        s.isBlank()
+    }
+}

plugin/src/test/projects/ExpediterPluginIntegrationTest/multi check/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     java
     id("com.toasttab.expediter")
-    id("com.toasttab.testkit.coverage") version "0.0.4"
+    id("com.toasttab.testkit.coverage") version "@TESTKIT_PLUGIN_VERSION@"
 }
 
 repositories {

plugin/src/test/projects/ExpediterPluginIntegrationTest/multimodule/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("com.toasttab.testkit.coverage") version "0.0.4"
+    id("com.toasttab.testkit.coverage") version "@TESTKIT_PLUGIN_VERSION@"
 }
 
 subprojects {

plugin/src/test/projects/ExpediterPluginIntegrationTest/protokt android compat/build.gradle.kts

@@ -0,0 +1,24 @@
+plugins {
+    kotlin("jvm") version "@KOTLIN_VERSION@"
+    id("com.toasttab.protokt") version "@PROTOKT_VERSION@"
+    id("com.toasttab.expediter")
+    id("com.toasttab.testkit.coverage") version "@TESTKIT_PLUGIN_VERSION@"
+}
+
+dependencies {
+    implementation("com.google.protobuf:protobuf-java:@PROTOBUF_VERSION@")
+}
+
+repositories {
+    mavenCentral()
+}
+
+expediter {
+    failOnIssues = true
+
+    platform {
+        android {
+            sdk = 21
+        }
+    }
+}

plugin/src/test/projects/ExpediterPluginIntegrationTest/protokt android compat/settings.gradle.kts

@@ -0,0 +1 @@
+rootProject.name = "test"

plugin/src/test/projects/ExpediterPluginIntegrationTest/protokt android compat/src/main/proto/test/v1/expediter.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+package test.v1;
+
+message Foo {
+  string name = 1;
+}