-
Notifications
You must be signed in to change notification settings - Fork 393
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.
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
Update Kotlin compiler to 1.8.20 #3062
Conversation
4673d21
to
80fc13b
Compare
80fc13b
to
523dbb8
Compare
523dbb8
to
0130109
Compare
0130109
to
66cfe58
Compare
5a5cb9a
to
79c74c3
Compare
@@ -528,7 +530,14 @@ class AnalysisEnvironment( | |||
} | |||
|
|||
// Set up JDK classpath roots explicitly because of https://github.com/JetBrains/kotlin/commit/f89765eb33dd95c8de33a919cca83651b326b246 | |||
internal fun configureJdkClasspathRoots() = configuration.configureJdkClasspathRoots() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was this function removed from the compiler with no replacement, or what was the motivation to copy paste the body?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What do you mean? Whose body?
It copies nothing.
configuration.configureJdkClasspathRoots()
still exists, it is used here too.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't understand where the rest of the new code in this function came from, and why it's needed :) As far as I can see, the called compiler function already checks for java.home
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't understand where the rest of the new code in this function came from, and why it's needed :)
It's needed for https://github.com/JetBrains/kotlin/blob/45b1c33ed8a33c92207d1bd9f2e83738995836ae/compiler/cli/cli-base/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt#L208 (support modular JDK)
The compiler does the same here
As far as I can see, the called compiler function already checks for java.home
It does not put JVMConfigurationKeys.JDK_HOME
in the configuration.
...nalysis/kotlin/descriptors/compiler/configuration/resolve/DokkaJsResolverForModuleFactory.kt
Outdated
Show resolved
Hide resolved
(cherry picked from commit 19d287f)
No description provided.