Skip to content

Commit 591728e

Browse files
committed
Resolve #1168 by way of a makeshift, in absence of better isolation of the ksp environment.
1 parent 681b218 commit 591728e

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/main/kotlin/io/bazel/kotlin/builder/toolchain/KotlinToolchain.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import io.bazel.kotlin.builder.utils.BazelRunFiles
2020
import io.bazel.kotlin.builder.utils.resolveVerified
2121
import io.bazel.kotlin.builder.utils.verified
2222
import io.bazel.kotlin.builder.utils.verifiedPath
23+
import org.jetbrains.kotlin.preloading.ClassCondition
2324
import org.jetbrains.kotlin.preloading.ClassPreloadingUtils
2425
import org.jetbrains.kotlin.preloading.Preloader
2526
import java.io.File
@@ -233,9 +234,11 @@ class KotlinToolchain private constructor(
233234
}
234235
},
235236
Preloader.DEFAULT_CLASS_NUMBER_ESTIMATE,
236-
classLoader,
237-
null,
238-
)
237+
classLoader
238+
) { className ->
239+
// Preload guava to avoid weird isolation issues.
240+
className.startsWith("com.google.common.")
241+
}
239242
}.onFailure {
240243
throw RuntimeException("$javaHome, $baseJars", it)
241244
}.getOrThrow()

0 commit comments

Comments
 (0)