From dc5011f7b7e0647f73922d94c5fde21266891728 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Feb 2021 11:17:50 +0300
Subject: [PATCH] Bump kotlin.version from 1.4.21 to 1.4.30 (#755)

* Bump kotlin.version from 1.4.21 to 1.4.30

Bumps `kotlin.version` from 1.4.21 to 1.4.30.

Updates `kotlin-stdlib-jdk8` from 1.4.21 to 1.4.30
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.4.21...v1.4.30)

Updates `kotlin-compiler-embeddable` from 1.4.21 to 1.4.30
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.4.21...v1.4.30)

Updates `kotlin-maven-plugin` from 1.4.21 to 1.4.30

Updates `kotlin-maven-serialization` from 1.4.21 to 1.4.30

Signed-off-by: dependabot[bot] <support@github.com>

* Fixed test
* Updated verison in build.gradle.kts and yml configs

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Peter Trifanov <peter.trifanov@mail.ru>
---
 diktat-analysis.yml                                         | 2 +-
 .../test/kotlin/org/cqfn/diktat/test/ConfigReaderTest.kt    | 6 +++---
 diktat-gradle-plugin/build.gradle.kts                       | 2 +-
 diktat-rules/src/main/resources/diktat-analysis-huawei.yml  | 2 +-
 diktat-rules/src/main/resources/diktat-analysis.yml         | 2 +-
 pom.xml                                                     | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/diktat-analysis.yml b/diktat-analysis.yml
index ba68d8ddce..545067dfdd 100644
--- a/diktat-analysis.yml
+++ b/diktat-analysis.yml
@@ -7,7 +7,7 @@
     # testDirs: test
     disabledChapters: ""
     testDirs: test
-    kotlinVersion: "1.4.21"
+    kotlinVersion: 1.4.30
 # Checks that the Class/Enum/Interface name does not match Pascal case
 - name: CLASS_NAME_INCORRECT
   enabled: true
diff --git a/diktat-common/src/test/kotlin/org/cqfn/diktat/test/ConfigReaderTest.kt b/diktat-common/src/test/kotlin/org/cqfn/diktat/test/ConfigReaderTest.kt
index b1b624a80e..4c0678fe65 100644
--- a/diktat-common/src/test/kotlin/org/cqfn/diktat/test/ConfigReaderTest.kt
+++ b/diktat-common/src/test/kotlin/org/cqfn/diktat/test/ConfigReaderTest.kt
@@ -23,12 +23,12 @@ class ConfigReaderTest {
     fun `testing kotlin version`() {
         val rulesConfigList: List<RulesConfig>? = RulesConfigReader(javaClass.classLoader)
             .readResource("src/test/resources/test-rules-config.yml")
-        val currentKotlinVersion = KotlinVersion.CURRENT
+        val kotlinVersionForTest = KotlinVersion(1, 4, 21)
         requireNotNull(rulesConfigList)
-        assert(rulesConfigList.getCommonConfiguration().value.kotlinVersion == currentKotlinVersion)
+        assert(rulesConfigList.getCommonConfiguration().value.kotlinVersion == kotlinVersionForTest)
         assert(rulesConfigList.find { it.name == DIKTAT_COMMON }
             ?.configuration
             ?.get("kotlinVersion")
-            ?.kotlinVersion() == currentKotlinVersion)
+            ?.kotlinVersion() == kotlinVersionForTest)
     }
 }
diff --git a/diktat-gradle-plugin/build.gradle.kts b/diktat-gradle-plugin/build.gradle.kts
index 467346ebb4..daa17dcf97 100644
--- a/diktat-gradle-plugin/build.gradle.kts
+++ b/diktat-gradle-plugin/build.gradle.kts
@@ -3,7 +3,7 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.getCurr
 
 plugins {
     `java-gradle-plugin`
-    kotlin("jvm") version "1.4.21"
+    kotlin("jvm") version "1.4.30"
     jacoco
     id("pl.droidsonroids.jacoco.testkit") version "1.0.7"
 }
diff --git a/diktat-rules/src/main/resources/diktat-analysis-huawei.yml b/diktat-rules/src/main/resources/diktat-analysis-huawei.yml
index 05e66815f2..841f5620ac 100644
--- a/diktat-rules/src/main/resources/diktat-analysis-huawei.yml
+++ b/diktat-rules/src/main/resources/diktat-analysis-huawei.yml
@@ -7,7 +7,7 @@
     # testDirs: test
     disabledChapters: ""
     testDirs: test
-    kotlinVersion: "1.4.21"
+    kotlinVersion: 1.4.30
 # Checks that the Class/Enum/Interface name does not match Pascal case
 - name: CLASS_NAME_INCORRECT
   enabled: true
diff --git a/diktat-rules/src/main/resources/diktat-analysis.yml b/diktat-rules/src/main/resources/diktat-analysis.yml
index 5c0ec14ca9..03be9196b8 100644
--- a/diktat-rules/src/main/resources/diktat-analysis.yml
+++ b/diktat-rules/src/main/resources/diktat-analysis.yml
@@ -5,7 +5,7 @@
     domainName: your.name.here
     testDirs: test
     disabledChapters: ""
-    kotlinVersion: "1.4.21"
+    kotlinVersion: 1.4
 # Checks that the Class/Enum/Interface name does not match Pascal case
 - name: CLASS_NAME_INCORRECT
   enabled: true
diff --git a/pom.xml b/pom.xml
index 2a7357d146..e053dfbbd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <kotlin.version>1.4.21</kotlin.version>
+        <kotlin.version>1.4.30</kotlin.version>
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
         <kotlinx.serialization.version>1.0.1</kotlinx.serialization.version>
         <ktlint.version>0.39.0</ktlint.version>