Update kotlin and gradle

build.gradle.kts

@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0")
         classpath("com.github.AlexPl292:mark-down-to-slack:1.1.2")
         classpath("org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r")
         classpath("org.kohsuke:github-api:1.135")
@@ -22,7 +22,7 @@ buildscript {
 plugins {
     antlr
     java
-    kotlin("jvm") version "1.5.0"
+    kotlin("jvm") version "1.6.0"
 
     id("org.jetbrains.intellij") version "1.3.0"
     id("org.jetbrains.changelog") version "1.3.1"
@@ -92,14 +92,14 @@ tasks {
     compileKotlin {
         kotlinOptions {
             jvmTarget = javaVersion
-            apiVersion = "1.3"
+            apiVersion = "1.4"
 //            allWarningsAsErrors = true
         }
     }
     compileTestKotlin {
         kotlinOptions {
             jvmTarget = javaVersion
-            apiVersion = "1.3"
+            apiVersion = "1.4"
 //            allWarningsAsErrors = true
         }
     }

gradle.properties

@@ -8,7 +8,7 @@ javaVersion=11
 remoteRobotVersion=0.11.6
 
 # Please don't forget to update kotlin version in buildscript section
-kotlinVersion=1.5.0
+kotlinVersion=1.6.0
 publishToken=token
 publishChannels=eap
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/maddyhome/idea/vim/group/visual/VisualMotionGroup.kt

@@ -251,7 +251,7 @@ class VisualMotionGroup {
     val selectionStartColumn = editor.offsetToLogicalPosition(selections.first().first).column
     val selectionStartLine = editor.offsetToLogicalPosition(selections.first().first).line
 
-    val maxColumn = selections.map { editor.offsetToLogicalPosition(it.second).column }.max() ?: return false
+    val maxColumn = selections.map { editor.offsetToLogicalPosition(it.second).column }.maxOrNull() ?: return false
     selections.forEachIndexed { i, it ->
       if (editor.offsetToLogicalPosition(it.first).line != editor.offsetToLogicalPosition(it.second).line) {
         return false
@@ -272,7 +272,8 @@ class VisualMotionGroup {
 
   private fun blockModeStartAndEnd(editor: Editor): Pair<Int, Int> {
     val selections = editor.caretModel.allCarets.map { it.selectionStart to it.selectionEnd }.sortedBy { it.first }
-    val maxColumn = selections.map { editor.offsetToLogicalPosition(it.second).column }.max() ?: error("No carets")
+    val maxColumn =
+      selections.map { editor.offsetToLogicalPosition(it.second).column }.maxOrNull() ?: error("No carets")
     val lastLine = editor.offsetToLogicalPosition(selections.last().first).line
     return selections.first().first to editor.logicalPositionToOffset(LogicalPosition(lastLine, maxColumn))
   }

src/main/java/com/maddyhome/idea/vim/option/OptionsManager.kt

@@ -54,7 +54,7 @@ import kotlin.math.min
  */
 @Deprecated("was replaced by OptionService")
 @ScheduledForRemoval(inVersion = "1.11")
-@Suppress("unused")
+@Suppress("unused", "DEPRECATION")
 object OptionsManager {
   private val logger = Logger.getInstance(OptionsManager::class.java)
 

src/test/java/org/jetbrains/plugins/ideavim/VimTestCase.kt

@@ -205,7 +205,7 @@ abstract class VimTestCase : UsefulTestCase() {
   protected fun configureByPages(pageCount: Int) {
     val stringBuilder = StringBuilder()
     repeat(pageCount * screenHeight) {
-      stringBuilder.appendln("I found it in a legendary land")
+      stringBuilder.appendLine("I found it in a legendary land")
     }
     configureByText(stringBuilder.toString())
   }
@@ -213,7 +213,7 @@ abstract class VimTestCase : UsefulTestCase() {
   protected fun configureByLines(lineCount: Int, line: String) {
     val stringBuilder = StringBuilder()
     repeat(lineCount - 1) {
-      stringBuilder.appendln(line)
+      stringBuilder.appendLine(line)
     }
     stringBuilder.append(line)
     configureByText(stringBuilder.toString())