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

Jump to bottom

Explicitly force project dependencies to JVM #2594

Merged
merged 1 commit into from
Aug 30, 2023
Merged

Explicitly force project dependencies to JVM #2594

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
15 changes: 11 additions & 4 deletions 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 @@ -38,6 +38,7 @@ import org.gradle.api.tasks.SourceSetContainer
import org.gradle.api.tasks.compile.JavaCompile
import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.sources.DefaultKotlinSourceSet
import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
Expand All @@ -64,9 +65,15 @@ class WirePlugin : Plugin<Project> {
it.isCanBeConsumed = false
it.isTransitive = false
}
project.configurations.create("protoProjectDependencies").also {
project.configurations.create("protoProjectDependenciesJvm").also {
it.isCanBeResolved = true
it.isCanBeConsumed = false
it.attributes { attributesContainer ->
// TODO(Benoit) If another project, on which this one depends, exposes multiple variants,
// Wire won't be able to pick one. We force the resolution to JVM. On the other hand, this
// breaks inter-module dependencies for non-jvm modules. We need to fix it.
attributesContainer.attribute(KotlinPlatformType.attribute, KotlinPlatformType.jvm)
}
}

val androidPluginHandler = { _: Plugin<*> ->
Expand Down Expand Up @@ -115,7 +122,7 @@ class WirePlugin : Plugin<Project> {
}
}

val projectDependenciesConfiguration = project.configurations.getByName("protoProjectDependencies")
val projectDependenciesJvmConfiguration = project.configurations.getByName("protoProjectDependenciesJvm")

val outputs = extension.outputs
check(outputs.isNotEmpty()) {
Expand Down Expand Up @@ -154,7 +161,7 @@ class WirePlugin : Plugin<Project> {
val projectDependencies =
(protoSourceInput.dependencies + protoPathInput.dependencies).filterIsInstance<ProjectDependency>()
for (projectDependency in projectDependencies) {
projectDependenciesConfiguration.dependencies.add(projectDependency)
projectDependenciesJvmConfiguration.dependencies.add(projectDependency)
}

val targets = outputs.map { output ->
Expand Down Expand Up @@ -228,7 +235,7 @@ class WirePlugin : Plugin<Project> {
)
}
task.outputDirectories.setFrom(outputDirectories)
task.projectDependencies.setFrom(projectDependenciesConfiguration)
task.projectDependencies.setFrom(projectDependenciesJvmConfiguration)
if (extension.protoLibrary) {
task.protoLibraryOutput.set(File(project.libraryProtoOutputPath()))
}
Expand Down
Loading