Update Kotlin to 1.5.31 version.

Developer Kotlin version to 1.6.0-RC.
pinterest · Oct 14, 2021 · 2440159 · 2440159
1 parent 1323851
commit 2440159
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Fix regression from 0.41 with argument list wrapping after dot qualified expression (`argument-list-wrapping`)([#1159](https://github.com/pinterest/ktlint/issues/1159))
 - Update Gradle to `7.2` version
 - Update Gradle shadow plugin to `7.1` version
+- Update Kotlin version to `1.5.31` version. Default Kotlin API version was changed to `1.4`!
 
 ### Removed
 

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 ext.versions = [
-  'kotlin': gradle.ext.isKotlinDev ? "1.5.30-RC" : "1.5.20",
+  'kotlin': gradle.ext.isKotlinDev ? "1.6.0-RC" : "1.5.31",
   'gradle': '7.2',
   'gradle-sha256': 'f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd'
 ]
@@ -51,21 +51,20 @@ allprojects {
     gradlePluginPortal()
   }
 
-  tasks.withType(JavaCompile) {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+  tasks.withType(JavaCompile).configureEach {
+    it.sourceCompatibility = JavaVersion.VERSION_1_8
+    it.targetCompatibility = JavaVersion.VERSION_1_8
   }
 
-  tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+  tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    it.sourceCompatibility = JavaVersion.VERSION_1_8
+    it.targetCompatibility = JavaVersion.VERSION_1_8
 
-    kotlinOptions {
+    it.kotlinOptions {
       jvmTarget = '1.8'
-      apiVersion = '1.3'
-      useIR = true
+      apiVersion = '1.4'
 
-      freeCompilerArgs = ["-Xopt-in=kotlin.RequiresOptIn"]
+      freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn"]
     }
   }
 }

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -45,6 +45,7 @@
             <trusting group="^org[.]junit($|([.].*))" regex="true"/>
             <trusting group="org.apiguardian"/>
             <trusting group="org.opentest4j"/>
+            <trusting group="org.apiguardian" name="apiguardian-api" version="1.0.0"/>
          </trusted-key>
          <trusted-key id="6214760097dc5cfad0175ac2c9fbaa83a8753994">
             <trusting group="com.fasterxml($|([.].*))" regex="true"/>
@@ -107,13 +108,17 @@
          <trusted-key id="d4c89ea4aaf455fd88b22087efe8086f9e93774e" group="junit" name="junit" version="4.12"/>
          <trusted-key id="d54a395b5cf3f86eb45f6e426b1b008864323b92" group="org.antlr"/>
          <trusted-key id="e62231331bca7e1f292c9b88c1b12a5d99c0729d" group="org.jetbrains"/>
-         <trusted-key id="e7dc75fc24fb3c8dfe8086ad3d5839a2262cbbfb" group="org.jetbrains.kotlinx"/>
+         <trusted-key id="e7dc75fc24fb3c8dfe8086ad3d5839a2262cbbfb">
+            <trusting group="org.jetbrains.kotlinx"/>
+            <trusting group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core-jvm" version="1.5.0"/>
+         </trusted-key>
          <trusted-key id="ea23db1360d9029481e7f2efecdfea3cb4493b94" group="jline" name="jline" version="2.14.6"/>
          <trusted-key id="f254b35617dc255d9344bcfa873a8e86b4372146" group="org.codehaus.plexus" name="plexus-utils" version="3.4.1"/>
          <trusted-key id="f3184bcd55f4d016e30d4c9bf42e87f9665015c9">
             <trusting group="org.jsoup"/>
             <trusting group="org.jsoup" name="jsoup" version="1.13.1"/>
          </trusted-key>
+         <trusted-key id="fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd" group="net.java.dev.jna" name="jna" version="5.6.0"/>
          <trusted-key id="fc411cd3cb7dcb0abc9801058118b3bcdb1a5000" group="jakarta.xml.bind"/>
          <trusted-key id="ff6e2c001948c5f2f38b0cc385911f425ec61b51">
             <trusting group="^org[.]junit($|([.].*))" regex="true"/>
@@ -1544,19 +1549,14 @@
             <sha256 value="e157c79dcc1fd01cd9692b2d576d606ecf6af2118786fea04dafc804ba66f777" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin.jvm" name="org.jetbrains.kotlin.jvm.gradle.plugin" version="1.4.31">
-         <artifact name="org.jetbrains.kotlin.jvm.gradle.plugin-1.4.31.pom">
-            <sha256 value="08681f8d2ee7315518487b324581160502923df7cd97e92a4e54e5c37d5f1dfd" origin="Generated by Gradle because artifact wasn't signed"/>
-         </artifact>
-      </component>
-      <component group="org.jetbrains.kotlin.jvm" name="org.jetbrains.kotlin.jvm.gradle.plugin" version="1.5.20">
-         <artifact name="org.jetbrains.kotlin.jvm.gradle.plugin-1.5.20.pom">
-            <sha256 value="2307dac79e7deae9ffc0c13f4daf20711e7af78f4b80ffa03a4b3697dbb88f00" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="org.jetbrains.kotlin.jvm" name="org.jetbrains.kotlin.jvm.gradle.plugin" version="1.5.31">
+         <artifact name="org.jetbrains.kotlin.jvm.gradle.plugin-1.5.31.pom">
+            <sha256 value="4f0889060231666b899f7e607cc7719b1beb30cc6decea67d34abded13b69413" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin.jvm" name="org.jetbrains.kotlin.jvm.gradle.plugin" version="1.5.30-RC">
-         <artifact name="org.jetbrains.kotlin.jvm.gradle.plugin-1.5.30-RC.pom">
-            <sha256 value="8715a988541401ce089935009830f9d0197851775ca9c21b4bc58185ec585ea2" origin="Generated by Gradle because artifact wasn't signed"/>
+      <component group="org.jetbrains.kotlin.jvm" name="org.jetbrains.kotlin.jvm.gradle.plugin" version="1.6.0-RC">
+         <artifact name="org.jetbrains.kotlin.jvm.gradle.plugin-1.6.0-RC.pom">
+            <sha256 value="b297be583e4f0f32d191698b40559c3ffa753f206ace8c8d35f92def4f7977cf" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core" version="1.2.1">

diff --git a/ktlint/src/main/kotlin/com/pinterest/ktlint/internal/IntellijIDEAIntegration.kt b/ktlint/src/main/kotlin/com/pinterest/ktlint/internal/IntellijIDEAIntegration.kt
@@ -1,6 +1,7 @@
 package com.pinterest.ktlint.internal
 
 import com.github.shyiko.klob.Glob
+import com.pinterest.ktlint.core.api.FeatureInAlphaState
 import com.pinterest.ktlint.core.internal.EditorConfigLoader
 import com.pinterest.ktlint.core.internal.EditorConfigLoader.Companion.convertToRawValues
 import java.io.ByteArrayInputStream
@@ -25,6 +26,7 @@ object IntellijIDEAIntegration {
 
     @Suppress("UNUSED_PARAMETER")
     @Throws(IOException::class)
+    @OptIn(FeatureInAlphaState::class)
     fun apply(workDir: Path, dryRun: Boolean, android: Boolean = false, local: Boolean = false): Array<Path> {
         val editorConfigProperties = EditorConfigLoader(FileSystems.getDefault())
             .loadPropertiesForFile(null, isStdIn = true, rules = emptySet())

diff --git a/settings.gradle b/settings.gradle
@@ -5,7 +5,7 @@ pluginManagement {
   }
 
   plugins {
-    def kotlinVersion = settings.hasProperty("kotlinDev") ? "1.5.30-RC" : "1.5.20"
+    def kotlinVersion = settings.hasProperty("kotlinDev") ? "1.6.0-RC" : "1.5.31"
     id 'org.jetbrains.kotlin.jvm' version kotlinVersion
     id 'com.github.breadmoirai.github-release' version '2.2.12'
     id 'com.github.johnrengelman.shadow' version '7.1.0'