Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: JetBrains/kotlin Loading
base: v1.8.20
Choose a base ref
...
head repository: JetBrains/kotlin Loading
compare: v1.8.21
Choose a head ref
  • 20 commits
  • 106 files changed
  • 13 contributors

Commits on Apr 12, 2023

  1. Configuration menu
    Copy the full SHA
    e4646f7 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2023

  1. Don't forget to configure JdkHome for CompilerConfiguration

    Review: https://jetbrains.team/p/kt/reviews/9562
    
    This commit fixes IdeaJsr223Test in kotlin plugin. The test failure was
    caused by b50a803 commit where we
    dropped `put(JVMConfigurationKeys.JDK_HOME, ...)` from
    `configureJdkClasspathRoots`. Ilya Chernikov says that it's incorrect to
    set JDK_HOME in `configureJdkClasspathRoots`.
    
    To reproduce the test failure:
    1. Update `.idea/libraries/kotlinc_kotlin_dist.xml` and
       `.idea/libraries/kotlinc_kotlin_jps_plugin_classpath.xml` with new
       Kotlin (in other words: bump bundled JPS)
    2. Run the test
    
    Test failure stacktrace:
    ```
    javax.script.ScriptException: error: cannot access 'java.io.Serializable' which is a supertype of 'kotlin.Int'. Check your module classpath for missing or conflicting dependencies
    y.first() + 2
              ^
      at org.jetbrains.kotlin.cli.common.repl.KotlinJsr223JvmScriptEngineBase.asJsr223EvalResult(KotlinJsr223JvmScriptEngineBase.kt:104)
      at org.jetbrains.kotlin.cli.common.repl.KotlinJsr223JvmScriptEngineBase.compileAndEval(KotlinJsr223JvmScriptEngineBase.kt:63)
      at org.jetbrains.kotlin.cli.common.repl.KotlinJsr223JvmScriptEngineBase.eval(KotlinJsr223JvmScriptEngineBase.kt:31)
      at java.scripting/javax.script.AbstractScriptEngine.eval(AbstractScriptEngine.java:262)
      at org.jetbrains.kotlin.idea.repl.IdeaJsr223Test.testJsr223Engine(IdeaJsr223Test.kt:31)
      at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
      at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
      at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
      at java.base/java.lang.reflect.Method.invoke(Method.java:568)
      at junit.framework.TestCase.runTest(TestCase.java:177)
      at com.intellij.testFramework.UsefulTestCase.lambda$runBare$11(UsefulTestCase.java:479)
      at com.intellij.testFramework.UsefulTestCase.lambda$wrapTestRunnable$13(UsefulTestCase.java:500)
    ```
    
    (cherry picked from commit 9ca7ee3)
    nikitabobko committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    5d18d7f View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2023

  1. [Gradle] Create commonize-kt-57796-twoCInteropCommonizerGroups to c…

    …over KT-57796
    
    (cherry picked from commit 59d78b4)
    sellmair committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    07de97e View commit details
    Browse the repository at this point in the history
  2. [Gradle] AbstractCInteropCommonizerTask: Do not use ';' character in …

    …fileName
    
    The ';' will later be used as path separator. Therefore,
    using the ';' as joiner for multiple cinterop commonizer groups
    will confuse the CLI argument parser inside the Commonizer
    
    ^KT-57796 Verification Pending
    
    (cherry picked from commit 4bc1271)
    sellmair committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    514d6a4 View commit details
    Browse the repository at this point in the history
  3. [Gradle] AbstractCInteropCommonizerTask: Do not use ':' character in …

    …fileName
    
    ":" is not allowed on Windows. Using _ instead
    
    ^KT-57796 Verification Pending
    
    (cherry picked from commit d40a20f)
    sellmair committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    20275ec View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2023

  1. Configuration menu
    Copy the full SHA
    584cad9 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. [Gradle] Mark nullable visibleSourceSetProvidingCInterops as Optional

    cherry-picked from 4819593
    
    ^KT-57677 Verification Pending
    antohaby authored and qodana-bot committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    6180d1a View commit details
    Browse the repository at this point in the history
  2. [K/N] Fix KT-57848

    (cherry picked from commit fb5b143)
    sbogolepov authored and qodana-bot committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    d50f585 View commit details
    Browse the repository at this point in the history
  3. [KAPT+IR] Use ErrorType for unresolved delegate class.

    ^KT-57946
    
    (cherry picked from commit 699ad87)
    madsager authored and qodana-bot committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    c98b2a7 View commit details
    Browse the repository at this point in the history
  4. Kapt+JVM_IR: do not generate super constructor call

     #KT-57699 Fixed
     #KT-57939 Fixed
    
    (cherry picked from commit 287e090)
    udalov authored and qodana-bot committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    3be65ec View commit details
    Browse the repository at this point in the history
  5. [K/JS] Change strategy for implicitly exported declarations if there …

    …is a cycled reference
    
    ^KT-57356 Fixed
    JSMonk authored and qodana-bot committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    153d7b9 View commit details
    Browse the repository at this point in the history
  6. [K/JS] Rework ES modules part with squashed JsImport and right renami…

    …ng strategy inside import/export statements
    JSMonk authored and qodana-bot committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    9f94142 View commit details
    Browse the repository at this point in the history
  7. Do not create cacheableChildSerializers unless it is necessary

    Creation of this property in the SerializerIrGenerator.<init> can lead to
    a 'Serializer not found' internal error when generator is applied to a fully-customized external serializer.
    In that case, generator is still created, but none of the generateSave/Load functions are called,
    so cacheableChildSerializers(Property) is not necessary.
    
    #KT-57730 Fixed
    Fixes Kotlin/kotlinx.serialization#2260
    
    (cherry picked from commit d9e16fb)
    sandwwraith authored and qodana-bot committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    a75271c View commit details
    Browse the repository at this point in the history
  8. Don't fail if there is no serializer for type parameters of contextua…

    …l serializer
    
    Return null instead.
    Such behaviour is needed to support cachedChildSerializers logic.
    Since this field creator doesn't provide genericGetter (because it's
    static),
    type param serializer can't be retrieved, and the whole contextual
    serializer shouldn't be cached.
    
    #KT-58067 Fixed
    
    (cherry picked from commit fa8f38c)
    sandwwraith authored and qodana-bot committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    34efee5 View commit details
    Browse the repository at this point in the history
  9. Correctly support nullability in type arguments for serializer<T>() i…

    …ntrinsic.
    
    Nullability info should be added to TYPE_OF operation marker.
    
    Fixes Kotlin/kotlinx.serialization#2265
    
    (cherry picked from commit ef9074e)
    sandwwraith authored and qodana-bot committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    ebdbaab View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2023

  1. Kapt+JVM_IR: generate delegated members correctly

    Generate a declaration for each delegated member without body. If we
    don't generate delegated declarations, subclasses will have incorrect IR
    with unbound symbols in fake overrides.
    
     #KT-58027 Fixed
    
    (cherry picked from commit bc7aea1)
    udalov committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    d44d8ea View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2023

  1. Fix maven script executor after changes in the jdk path processing

    also avoid unnecessary warnign about scripts in source roots
    #KT-58101 fixed
    ligee authored and qodana-bot committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    ea2e0bd View commit details
    Browse the repository at this point in the history
  2. [KxSerialization] Fix "IllegalAccessError: Update to static final field"

    Fixed #KT-57647
    
    For value classes, if you add code to companion anonymous init block in IR, it will be executed in the instance constructor. This causes an error when initializing static fields, because writing to them can only occur from the <clinit> method.
    
    The solution is to transfer the static field initialization code from an anonymous init block to the IR initializer of this field
    shanshin committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    035172c View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2023

  1. [Maven] Filter duplicated source roots to avoid multiple module decla…

    …rations exception
    
    After fixing of KT-13995 (99de93b) there is a case when several maven plugins register the same source roots twice, which leads to the Kotlin compiler exception "Too many source module declarations found". kotlin-maven-plugin should take care of what it passes to the Kotlin compiler to avoid it
    
    #KT-58048 Fixed
    
    Merge-request: KT-MR-9716
    Merged-by: Aleksei Cherepanov <[email protected]>
    (cherry picked from commit 803a110)
    Aleksei.Cherepanov authored and qodana-bot committed Apr 22, 2023
    Configuration menu
    Copy the full SHA
    92c7d49 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2023

  1. Add Changelog for 1.8.21

    woainikk committed Apr 24, 2023
    Configuration menu
    Copy the full SHA
    ec1553a View commit details
    Browse the repository at this point in the history
Loading