Update kotlin to 1.4.20 #169
Merged
Conversation
This file contains 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
This PR updates kotlin base version to 1.4.20. Visibilities has moved to DescriptorVisibilties. JavaVisibilities has moved to JavaDescriptorVisibilities Test configuration now requires a backend, I picked JVM Updated intellij base version to 202.8194.7 Updated intellij gradle plugin to 0.6.4 One unexpected changes is that seems like testing prebuilt now also requires mutes. I've added that jar as well. Fixes: google#168
neetopia
reviewed
Nov 25, 2020
| @@ -1,7 +1,7 @@ | |||
| # Copied from kotlinc | |||
| org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx2200m -Dfile.encoding=UTF-8 | |||
|
|
|||
| kotlinBaseVersion=1.4.10 | |||
| intellijVersion=193.6494.35 | |||
There was a problem hiding this comment.
Not sure if this is necessary, I have a commit without this change but still works.
There was a problem hiding this comment.
my tests were failing until i updated intellijVersion.
There was a problem hiding this comment.
i tried reverting it but then tests fail with:
'void com.intellij.core.CoreApplicationEnvironment.registerExtensionPointAndExtensions(java.nio.file.Path, java.lang.String, com.intellij.openapi.extensions.ExtensionsArea)'
java.lang.NoSuchMethodError: 'void com.intellij.core.CoreApplicationEnvironment.registerExtensionPointAndExtensions(java.nio.file.Path, java.lang.String, com.intellij.openapi.extensions.ExtensionsArea)'
at org.jetbrains.kotlin.cli.jvm.compiler.CoreApplicationEnvironmentCompatKt.registerExtensionPointAndExtensionsEx(coreApplicationEnvironmentCompat.kt:17)
at org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment$Companion.registerApplicationExtensionPointsAndExtensionsFrom(KotlinCoreEnvironment.kt:537)
so your tests pass w/o this change?
There was a problem hiding this comment.
I see, my change is without test enabled due to test-mutes module issue, then it makes sense to upgrade intellij version.
There was a problem hiding this comment.
👍
i added the test-mutes here to fix that, seems to be working fine.
There was a problem hiding this comment.
i also tried breaking a test to ensure they are really run :)
|
LGTM, I'll merge it before next release. |
ting-yuan
reviewed
Nov 25, 2020
ting-yuan
approved these changes
Nov 26, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR updates kotlin base version to 1.4.20.
Visibilities has moved to DescriptorVisibilties.
JavaVisibilities has moved to JavaDescriptorVisibilities
Test configuration now requires a backend, I picked JVM
Updated intellij base version to 202.8194.7
Updated intellij gradle plugin to 0.6.4
One unexpected changes is that seems like testing prebuilt
now also requires mutes. I've added that jar as well.
Fixes: #168