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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.2.30
Choose a base ref
...
head repository: JetBrains/kotlin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.2.30
Choose a head ref
  • 12 commits
  • 26 files changed
  • 10 contributors

Commits on Mar 13, 2018

  1. Remove Redundant Backticks: Fix inspection applicability

     #KT-22804 Fixed
    
    (cherry picked from commit a194eb9)
    asedunov committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    7154315 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2018

  1. Fix binary incompatibility with Android Gradle plugin 3.2.0-alpha06

    Remove a non-reflective usage of the ResourceSet class, which has been
    moved to a different package between versions. Access it through
    reflection instead. This is a workaround. We can introduce a proper
    fix once we have a public API in the Android plugin.
    
    The test case that could detect the compatibility issue is
    `testAndroidExtensionsManyVariants` (it uses experimental Android
    extensions), but we did not run it with 3.2.0-alpha6. This commit
    adds a test class with the same tests for 3.2.0-alpha6.
    
    Issue #KT-23192 Fixed
    
    (cherry picked from commit 0039be6)
    h0tk3y committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    f100e83 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7150fc0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c425e02 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3d798b4 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2018

  1. Add changelog for 1.2.31

    dsavvinov committed Mar 16, 2018
    Configuration menu
    Copy the full SHA
    e43175b View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2018

  1. Fixed broken exception reporter

    (cherry picked from commit 7d72fe0)
    Alefas committed Mar 21, 2018
    Configuration menu
    Copy the full SHA
    0a92d9c View commit details
    Browse the repository at this point in the history
  2. Restore old package for ScriptTemplatesProvider.

    Note that this is EP used in another plugins (ex. LivePlugin https://plugins.jetbrains.com/plugin/7282-liveplugin)
    
    (cherry picked from commit 82481b4)
    NataliaUkhorskaya committed Mar 21, 2018
    Configuration menu
    Copy the full SHA
    ec490af View commit details
    Browse the repository at this point in the history
  3. Build: add maven.repository.mirror property

    May be used to add additional repository to all projects
    4u7 committed Mar 21, 2018
    Configuration menu
    Copy the full SHA
    8ddcd36 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2018

  1. Hitting breakpoint in Kotlin sometimes doesn't work (KT-22205)

    Fix KT-22205 and https://issuetracker.google.com/issues/71556313
    
    Hitting breakpoints in Kotlin JUnit test with an Android Gradle
    project sometimes(*) does not work in Android Studio 3.1 beta.
    
    (*) The issue is related to various threads running concurrently
    with "dumb" mode background code, so the issue reproduces only
    on certain configurations.
    
    In a nutshell, the issue is as follows
    
    * On one hand, gradle build finishes, fires an event ("buildFinished")
      that is processed "later" and that causes the IDE to enter "dumb" mode
      for a shot amount of time (about 300-500 msec on a somewhat up to date
      multi-core computer).
    
    * On the other hand, once the JVM of the debuggee is started, breakpoints
      need to be resolved (on the debugger thread, through a call to
      com.intellij.debugger.engine.CompoundPositionManager.createPrepareRequests.
      This code calls into the "KotlinPositionManager.createPrepareRequests",
      which in turns calls into "PerFileAnalysisCache.analyze". That method
      returns "AnalysisResult.EMPTY" is the project is in dumb mode.
      This return value prevents callers from successfully resolving
      the source location into a breakpoint.
    
    Given that the 2 code paths above execute on separate threads without
    explicit synchronization, the "failed to resolve breakpoint" issue
    occurs sporadically, to the point it happens 100% of the time on
    certain configuration.
    
    The fix is so wrap the kotlin breakpoint resolution code inside
    a "runReadActionInSmartMode" so that the debugger thread "waits"
    for "dumb" mode to terminates before trying to resolve breakpoint
    locations.
    
     #KT-22205 Fixed
    
    (cherry picked from commit 94ee78c)
    rpaquay authored and Alefas committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    ad38c3e View commit details
    Browse the repository at this point in the history
  2. Fix compatibility with LivePlugin

    ^KT-23371 Fixed
    
    (cherry picked from commit c7513b5)
    NataliaUkhorskaya committed Mar 22, 2018
    Configuration menu
    Copy the full SHA
    f4049e6 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2018

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