Skip to content

Resolve #1168 by way of a makeshift, in absence of better isolation of the ksp environment. #1284

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Resolve #1168 by way of a makeshift, in absence of better isolation of the ksp environment. #1284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5a2c98
Resolve #1168 by way of a makeshift, in absence of better isolation o…
cgruber Mar 14, 2025
e4a7d4f
Drive by fix, to handle some collisions with later protobuf imports. …
cgruber Mar 14, 2025
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
4 changes: 2 additions & 2 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ maven.install(
artifacts = [
"com.google.code.findbugs:jsr305:3.0.2",
"junit:junit:4.13-beta-3",
"com.google.protobuf:protobuf-java:3.6.0",
"com.google.protobuf:protobuf-java-util:3.6.0",
"com.google.protobuf:protobuf-java:3.25.6",
"com.google.protobuf:protobuf-java-util:3.26.6",
"com.google.guava:guava:27.1-jre",
"com.google.truth:truth:0.45",
"com.google.auto.service:auto-service:1.1.1",
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/io/bazel/kotlin/builder/toolchain/CompilationTaskContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class CompilationTaskContext(
header: String,
msg: MessageOrBuilder,
) {
printLines(header, TextFormat.printToString(msg).split("\n"), filterEmpty = true)
printLines(header, TextFormat.printer().printToString(msg).split("\n"), filterEmpty = true)
}

/**
Expand Down
6 changes: 4 additions & 2 deletions src/main/kotlin/io/bazel/kotlin/builder/toolchain/KotlinToolchain.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,10 @@ class KotlinToolchain private constructor(
},
Preloader.DEFAULT_CLASS_NUMBER_ESTIMATE,
classLoader,
null,
)
) { className ->
// Preload guava to avoid weird isolation issues.
className.startsWith("com.google.common.")
}
}.onFailure {
throw RuntimeException("$javaHome, $baseJars", it)
}.getOrThrow()
Expand Down