Skip to content

Commit

Permalink
Fix KSP guava conflict by cherry-picking suggested changes in bazelbu…
Browse files Browse the repository at this point in the history
  • Loading branch information
oliviernotteghem committed Dec 9, 2024
1 parent 04c835a commit 3982dbf
Showing 1 changed file with 6 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import io.bazel.kotlin.builder.utils.BazelRunFiles
import io.bazel.kotlin.builder.utils.resolveVerified
import io.bazel.kotlin.builder.utils.verified
import io.bazel.kotlin.builder.utils.verifiedPath
import org.jetbrains.kotlin.preloading.ClassCondition
import org.jetbrains.kotlin.preloading.ClassPreloadingUtils
import org.jetbrains.kotlin.preloading.Preloader
import java.io.File
Expand Down Expand Up @@ -190,7 +191,11 @@ class KotlinToolchain private constructor(
},
Preloader.DEFAULT_CLASS_NUMBER_ESTIMATE,
classLoader,
null,
object: ClassCondition {
override fun accept(className: String): Boolean {
return className.startsWith("com.google.common.")
}
},
)
}.onFailure {
throw RuntimeException("$javaHome, $baseJars", it)
Expand Down

0 comments on commit 3982dbf

Please sign in to comment.