Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use reflection for KotlinCompile.source() invocations #2273

Merged
merged 1 commit into from
May 25, 2022
Merged

Use reflection for KotlinCompile.source() invocations #2273

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions wire-library/wire-gradle-plugin/src/main/kotlin/com/squareup/wire/gradle/WirePlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import org.jetbrains.kotlin.gradle.plugin.sources.DefaultKotlinSourceSet
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.io.File
import java.lang.reflect.Array as JavaArray
import java.util.concurrent.atomic.AtomicBoolean

class WirePlugin : Plugin<Project> {
Expand Down Expand Up @@ -159,17 +160,22 @@ class WirePlugin : Plugin<Project> {
// Even though we add the Wire output directories into the corresponding sourceSets, the
// compilation tasks won't know about them so we fix that here.
if (hasJavaOutput) {
project.tasks.matching { it.name == "compileJava" }.configureEach {
(it as JavaCompile).source(generatedSourcesDirectories)
}
project.tasks
.withType(JavaCompile::class.java)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opportunistically added these to save the cast below. You may even be able to nix the name matching entirely but I wasn't sure how precise those were intended to be

.matching { it.name == "compileJava" }
.configureEach {
it.source(generatedSourcesDirectories)
}
}
if (hasJavaOutput || hasKotlinOutput) {
project.tasks.matching {
it.name == "compileKotlin" || it.name == "compile${source.name.capitalize()}Kotlin"
}.configureEach {
// Note that [KotlinCompile.source] will process files but will ignore strings.
(it as KotlinCompile).source(generatedSourcesDirectories)
}
project.tasks
.withType(KotlinCompile::class.java)
.matching {
it.name == "compileKotlin" || it.name == "compile${source.name.capitalize()}Kotlin"
}.configureEach {
// Note that [KotlinCompile.source] will process files but will ignore strings.
SOURCE_FUNCTION.invoke(it, arrayOf(generatedSourcesDirectories))
}
}

// TODO: pair up generatedSourceDirectories with their targets so we can be precise.
Expand Down Expand Up @@ -276,5 +282,11 @@ class WirePlugin : Plugin<Project> {
internal companion object {
const val PARENT_TASK = "generateProtos"
const val GROUP = "wire"
// The signature of this function changed in Kotlin 1.7, so we invoke it reflectively
// to support both.
// 1.6.x: `fun source(vararg sources: Any): SourceTask
// 1.7.x: `fun source(vararg sources: Any)
private val SOURCE_FUNCTION = KotlinCompile::class.java
.getMethod("source", JavaArray.newInstance(Any::class.java, 0).javaClass)
}
}