Merge remote-tracking branch 'origin/master'
authorDmitriy.Panov <Dmitriy.Panov@jetbrains.com>
Wed, 21 Apr 2021 00:18:59 +0000 (03:18 +0300)
committerintellij-monorepo-bot <intellij-monorepo-bot-no-reply@jetbrains.com>
Wed, 21 Apr 2021 00:18:59 +0000 (03:18 +0300)
GitOrigin-RevId: b96ba40efd7da532d5d567adceb0aa41cf930f87

1  2 
build/dependencies/gradle.properties
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy

index 555040251ddffc5696d227554660f386abe725dc,1d35a3d43d7d5a3e85da37ae1d8d4b79669800bb..ba148435fc175597d37fbe5ebca20ffcffc825e9
@@@ -4,6 -4,6 +4,6 @@@ bundledMavenVersion=3.6.
  gradleApiVersion=5.2.1
  jdkBuild=11_0_10b1428.2
  jetSignBuild=42.48
- kotlinCompilerBuild=212-1.4.32-release-IJ1741:Ideadev
 -kotlinPluginBuild=212-1.4.32-release-IJ2230:Ideadev
++kotlinCompilerBuild=212-1.4.32-release-IJ2230:Ideadev
  rkernelVersion=master.166
  zkmVersion=15.0.2