copy JDK_HOME bootstrap files to forwarding toolchain directory for Kotlin#418
Merged
copy JDK_HOME bootstrap files to forwarding toolchain directory for Kotlin#418
Conversation
Strum355
force-pushed
the
nsc/kotlin-jvm-toolchains
branch
from
1a71469 to
d93358d
Compare
Contributor
Author
|
I might have to change this to copy everything, as symbolic links under Windows has historically required elevated permissions. What do you think? @olafurpg |
Strum355
changed the title
Strum355
force-pushed
the
nsc/kotlin-jvm-toolchains
branch
from
b4179b1 to
6d3b2d2
Compare
lsif-java/src/main/scala/com/sourcegraph/lsif_java/buildtools/GradleJavaCompiler.scala
Outdated
Show resolved
Hide resolved
Strum355
changed the title
lsif-java/src/main/scala/com/sourcegraph/lsif_java/buildtools/GradleJavaCompiler.scala
Show resolved
Hide resolved
Strum355
force-pushed
the
nsc/kotlin-jvm-toolchains
branch
from
0ca7533 to
f11080f
Compare
lsif-java/src/main/scala/com/sourcegraph/lsif_java/buildtools/GradleJavaCompiler.scala
Outdated
Show resolved
Hide resolved
varungandhi-src
approved these changes
Mar 28, 2022
Contributor
varungandhi-src
left a comment
varungandhi-src
left a comment
There was a problem hiding this comment.
LGTM, probably could be compressed a bit more but thanks for simplifying away the class definition.
…GradleJavaCompiler.scala Co-authored-by: Varun Gandhi <varun.gandhi@sourcegraph.com>
Comment on lines
+123
to
+134
| val javaHome = javacPath.getParent.getParent | ||
| val libPath = dir.resolve("lib") | ||
| val javacLibPath = javaHome.resolve("lib") | ||
| copyFiles(javacLibPath, libPath) | ||
|
|
||
| if (languageVersion == "8") { | ||
| val jreLibPath = dir.resolve("jre").resolve("lib") | ||
| Files.createDirectories(jreLibPath.getParent) | ||
| val javacJreLibPath = javaHome.resolve("jre").resolve("lib") | ||
|
|
||
| copyFiles(javacJreLibPath, jreLibPath) | ||
| } |
Contributor
There was a problem hiding this comment.
Nice and compact! 🍬
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #417
Test plan
I tested this on https://github.com/fwcd/kotlin-language-server 🙂