Skip to content
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

Merged
merged 3 commits into from
Jul 18, 2023
Merged

Conversation

vmishenev
Copy link
Member

No description provided.

@vmishenev vmishenev force-pushed the update-kotlin-compiler-1.8.20 branch from 4673d21 to 80fc13b Compare July 7, 2023 05:05
@vmishenev vmishenev force-pushed the update-kotlin-compiler-1.8.20 branch from 80fc13b to 523dbb8 Compare July 17, 2023 14:44
@vmishenev vmishenev changed the title Update Kotlin compiler to 1.8.20 and IntelliJ platform Update Kotlin compiler to 1.8.20 Jul 17, 2023
@vmishenev vmishenev force-pushed the update-kotlin-compiler-1.8.20 branch from 523dbb8 to 0130109 Compare July 17, 2023 15:36
@vmishenev vmishenev force-pushed the update-kotlin-compiler-1.8.20 branch from 0130109 to 66cfe58 Compare July 17, 2023 15:38
@@ -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()
Copy link
Member

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?

Copy link
Member Author

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.

Copy link
Member

@IgnatBeresnev IgnatBeresnev Jul 18, 2023

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

Copy link
Member Author

@vmishenev vmishenev Jul 18, 2023

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.

@vmishenev vmishenev merged commit 19d287f into master Jul 18, 2023
12 checks passed
@vmishenev vmishenev deleted the update-kotlin-compiler-1.8.20 branch July 18, 2023 19:33
IgnatBeresnev pushed a commit that referenced this pull request Jul 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants