Update kotlin to 1.3.70 version. (#712)

* Update Kotlin to 1.3.70 version. * Fix deprecations. Signed-off-by: Yahor Berdnikau <[email protected]>
pinterest · Mar 8, 2020 · a86d1c7 · a86d1c7
1 parent 9eb31ca
commit a86d1c7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,23 @@
 All notable changes to this project will be documented in this file.  
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Unreleased
+
+### Added
+- ?
+
+### Changed
+- Kotlin was updated to 1.3.70 version
+
+### Fixed
+- ?
+
+### Deprecated
+- ?
+
+### Removed
+- ?
+
 ## [0.36.0] - 2019-12-03
 
 ### Added

diff --git a/build.gradle b/build.gradle
@@ -1,10 +1,10 @@
 plugins {
-  id 'org.jetbrains.kotlin.jvm' version '1.3.60' apply false
+  id 'org.jetbrains.kotlin.jvm' version '1.3.70' apply false
   id 'com.vanniktech.maven.publish' version '0.8.0' apply false
 }
 
 ext.versions = [
-  'kotlin': '1.3.60',
+  'kotlin': '1.3.70',
   'gradle': '5.6.2'
 ]
 

diff --git a/ktlint-core/src/main/kotlin/com/pinterest/ktlint/core/KtLint.kt b/ktlint-core/src/main/kotlin/com/pinterest/ktlint/core/KtLint.kt
@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.com.intellij.openapi.Disposable
 import org.jetbrains.kotlin.com.intellij.openapi.diagnostic.DefaultLogger
 import org.jetbrains.kotlin.com.intellij.openapi.diagnostic.Logger as DiagnosticLogger
 import org.jetbrains.kotlin.com.intellij.openapi.extensions.ExtensionPoint
-import org.jetbrains.kotlin.com.intellij.openapi.extensions.Extensions.getArea
+import org.jetbrains.kotlin.com.intellij.openapi.extensions.Extensions.getRootArea
 import org.jetbrains.kotlin.com.intellij.openapi.util.Key
 import org.jetbrains.kotlin.com.intellij.openapi.util.UserDataHolderBase
 import org.jetbrains.kotlin.com.intellij.pom.PomModel
@@ -114,7 +114,7 @@ object KtLint {
         }
         val extensionPoint = "org.jetbrains.kotlin.com.intellij.treeCopyHandler"
         val extensionClassName = TreeCopyHandler::class.java.name!!
-        for (area in arrayOf(getArea(project), getArea(null))) {
+        for (area in arrayOf(project.extensionArea, getRootArea())) {
             if (!area.hasExtensionPoint(extensionPoint)) {
                 area.registerExtensionPoint(extensionPoint, extensionClassName, ExtensionPoint.Kind.INTERFACE)
             }