Upgrade Kotlin version to 1.6.0

Abduqodiri Qurbonzoda · qurbonzoda · commit ce1b32db76b0 · 2021-12-27T22:56:50.000+03:00
diff --git a/benchmarks/runner/src/csvPrinter.kt b/benchmarks/runner/src/csvPrinter.kt
@@ -15,11 +15,11 @@ fun printCsvResults(benchmarkResults: BenchmarkResults, outputPath: String) {
     File(outputPath).parentFile?.mkdirs()
     val fileWriter = FileWriter(outputPath)
 
-    fileWriter.appendln(csvHeader)
+    fileWriter.appendLine(csvHeader)
     benchmarkResults.runResults.forEach { res ->
         val paramsValuesString = benchmarkResults.paramsNames.joinToString(",") { res.paramValue(it) }
         val csvRow = "${res.benchmark},$paramsValuesString,${res.score.formatted()},${res.scoreError.formatted()},${res.allocRate.formatted()}"
-        fileWriter.appendln(csvRow)
+        fileWriter.appendLine(csvRow)
     }
 
     fileWriter.flush()
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,6 @@
 buildscript {
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0")
     }
 }
 
diff --git a/core/commonMain/src/extensions.kt b/core/commonMain/src/extensions.kt
@@ -48,6 +48,7 @@ inline fun <T> PersistentList<T>.mutate(mutator: (MutableList<T>) -> Unit): Pers
  * @return a new persistent map with the provided modifications applied;
  * or this instance if no modifications were made in the result of this operation.
  */
+@Suppress("UNCHECKED_CAST")
 inline fun <K, V> PersistentMap<out K, V>.mutate(mutator: (MutableMap<K, V>) -> Unit): PersistentMap<K, V> =
         (this as PersistentMap<K, V>).builder().apply(mutator).build()
 
@@ -321,6 +322,7 @@ infix fun <E> PersistentCollection<E>.intersect(elements: Iterable<E>): Persiste
  * @return a new persistent map with an entry from the specified key-value [pair] added;
  * or this instance if no modifications were made in the result of this operation.
  */
+@Suppress("UNCHECKED_CAST")
 inline operator fun <K, V> PersistentMap<out K, V>.plus(pair: Pair<K, V>): PersistentMap<K, V>
         = (this as PersistentMap<K, V>).put(pair.first, pair.second)
 
@@ -369,6 +371,7 @@ inline operator fun <K, V> PersistentMap<out K, V>.plus(map: Map<out K, V>): Per
  * @return a new persistent map with keys and values from the specified [map] associated;
  * or this instance if no modifications were made in the result of this operation.
  */
+@Suppress("UNCHECKED_CAST")
 public fun <K, V> PersistentMap<out K, V>.putAll(map: Map<out K, V>): PersistentMap<K, V> =
         (this as PersistentMap<K, V>).putAll(map)
 
@@ -406,6 +409,7 @@ public fun <K, V> PersistentMap<out K, V>.putAll(pairs: Sequence<Pair<K, V>>): P
  * @return a new persistent map with the specified [key] and its corresponding value removed;
  * or this instance if it contains no mapping for the key.
  */
+@Suppress("UNCHECKED_CAST")
 public operator fun <K, V> PersistentMap<out K, V>.minus(key: K): PersistentMap<K, V>
         = (this as PersistentMap<K, V>).remove(key)
 
diff --git a/core/commonMain/src/implementations/immutableMap/PersistentHashMapBuilderContentViews.kt b/core/commonMain/src/implementations/immutableMap/PersistentHashMapBuilderContentViews.kt
@@ -11,13 +11,15 @@ import kotlinx.collections.immutable.internal.MapImplementation
 internal abstract class AbstractMapBuilderEntries<E : Map.Entry<K, V>, K, V> : AbstractMutableSet<E>() {
     final override fun contains(element: E): Boolean {
         // TODO: Eliminate this check after KT-30016 gets fixed.
+        @Suppress("USELESS_CAST")
         if ((element as? Any?) !is Map.Entry<*, *>) return false
         return containsEntry(element)
     }
     abstract fun containsEntry(element: Map.Entry<K, V>): Boolean
 
     final override fun remove(element: E): Boolean {
         // TODO: Eliminate this check after KT-30016 gets fixed.
+        @Suppress("USELESS_CAST")
         if ((element as? Any?) !is Map.Entry<*, *>) return false
         return removeEntry(element)
     }
diff --git a/core/commonTest/src/contract/list/ImmutableListTest.kt b/core/commonTest/src/contract/list/ImmutableListTest.kt
@@ -84,7 +84,7 @@ class ImmutableListTest {
         var list = "abcxaxab12".toImmutableList().toPersistentList()
 
         for (i in list.indices) {
-            list = list.set(i, list[i] as Char + i)
+            list = list.set(i, list[i] + i)
         }
 
         assertEquals("ace{e}gi9;", list.joinToString(""))
@@ -120,7 +120,6 @@ class ImmutableListTest {
     @Test fun subList() {
         val list = "abcxaxyz12".toImmutableList()
         val subList = list.subList(2, 5) // 2, 3, 4
-        assertTrue(subList is ImmutableList)
         compareLists(listOf('c', 'x', 'a'), subList)
 
         assertFailsWith<IndexOutOfBoundsException> { list.subList(-1, 2) }
@@ -142,7 +141,7 @@ class ImmutableListTest {
             testMutation { add(0, 'K') }
             testMutation { addAll("kotlin".toList()) }
             testMutation { addAll(0, "kotlin".toList()) }
-            testMutation { this[1] = this[1] as Char + 2 }
+            testMutation { this[1] = this[1] + 2 }
             testMutation { removeAt(lastIndex) }
             testMutation { remove('x') }
             testMutation { removeAll(listOf('x')) }
diff --git a/core/commonTest/src/contract/map/ImmutableMapTest.kt b/core/commonTest/src/contract/map/ImmutableMapTest.kt
@@ -80,7 +80,7 @@ class ImmutableHashMapTest : ImmutableMapTest() {
         // https://github.com/Kotlin/kotlinx.collections.immutable/issues/109
         val map0 = immutableMapOf<Int, Int>().put(0, 0).put(1, 1).put(32, 32)
         val map1 = map0.mutate { it.remove(0) }
-        val map2 = map1.mutate {
+        map1.mutate {
             it.remove(1)
             it.remove(0)
         }
@@ -251,7 +251,7 @@ abstract class ImmutableMapTest {
     @Test fun builder() {
 
         val builder = immutableMapOf<Char, Int?>().builder()
-        "abcxaxyz12".associateTo(builder) { it to it.toInt() }
+        "abcxaxyz12".associateTo(builder) { it to it.code }
         val map = builder.build()
         assertEquals<Map<*, *>>(map, builder)
         assertSame(map, builder.build(), "Building the same list without modifications")
diff --git a/core/commonTest/src/implementations/list/TrieIteratorTest.kt b/core/commonTest/src/implementations/list/TrieIteratorTest.kt
@@ -40,8 +40,10 @@ class TrieIteratorTest {
             leaves = newLeaves
         }
 
-        assert(leaves.size == 1)
-        return leaves[0] as Array<Any?>
+        check(leaves.size == 1)
+
+        @Suppress("UNCHECKED_CAST")
+        return leaves.single() as Array<Any?>
     }
 
     @Test
diff --git a/core/commonTest/src/implementations/map/HashMapTrieNodeTest.kt b/core/commonTest/src/implementations/map/HashMapTrieNodeTest.kt
@@ -16,6 +16,7 @@ class HashMapTrieNodeTest {
     private fun testEmptyMap(map: PersistentHashMap<IntWrapper, Int>) {
         map.node.accept { node: TrieNode<IntWrapper, Int>, shift: Int, hash: Int, dataMap: Int, nodeMap: Int ->
             assertEquals(0, shift)
+            assertEquals(0, hash)
             assertEquals(0, dataMap)
             assertEquals(0, nodeMap)
             assertTrue(node.buffer.isEmpty())
@@ -33,6 +34,7 @@ class HashMapTrieNodeTest {
 
         map.node.accept { node: TrieNode<IntWrapper, Int>, shift: Int, hash: Int, dataMap: Int, nodeMap: Int ->
             assertEquals(0, shift)
+            assertEquals(0, hash)
             assertEquals(1 shl 0b01101, dataMap)
             assertEquals(0b0, nodeMap)
             assertTrue(arrayOf<Any?>(wrapper1, 1) contentEquals node.buffer)
@@ -74,6 +76,7 @@ class HashMapTrieNodeTest {
 
         map.remove(wrapper1).node.accept { node: TrieNode<IntWrapper, Int>, shift: Int, hash: Int, dataMap: Int, nodeMap: Int ->
             assertEquals(0, shift)
+            assertEquals(0, hash)
             assertEquals(0b10, dataMap)
             assertEquals(0b0, nodeMap)
             assertTrue(arrayOf<Any?>(wrapper33, 33) contentEquals node.buffer)
@@ -183,6 +186,7 @@ class HashMapTrieNodeTest {
 
         map.remove(wrapper1).remove(wrapper1057).node.accept { node: TrieNode<IntWrapper, Int>, shift: Int, hash: Int, dataMap: Int, nodeMap: Int ->
             assertEquals(0, shift)
+            assertEquals(0, hash)
             assertEquals(0b10, dataMap)
             assertEquals(0b0, nodeMap)
             assertTrue(arrayOf<Any?>(wrapper33, 33) contentEquals node.buffer)
@@ -228,6 +232,7 @@ class HashMapTrieNodeTest {
 
         map.remove(wrapper1).node.accept { node: TrieNode<IntWrapper, Int>, shift: Int, hash: Int, dataMap: Int, nodeMap: Int ->
             assertEquals(0, shift)
+            assertEquals(0, hash)
             assertEquals(0b10, dataMap)
             assertEquals(0b0, nodeMap)
             assertTrue(arrayOf(wrapper2, 2) contentEquals node.buffer)
@@ -351,6 +356,7 @@ class HashMapTrieNodeTest {
 
         map.remove(wrapper3).remove(wrapper1).node.accept { node: TrieNode<IntWrapper, Int>, shift: Int, hash: Int, dataMap: Int, nodeMap: Int ->
             assertEquals(0, shift)
+            assertEquals(0, hash)
             assertEquals(0b10, dataMap)
             assertEquals(0b0, nodeMap)
             assertTrue(arrayOf<Any?>(wrapper2, 2) contentEquals node.buffer)
diff --git a/core/commonTest/src/stress/ExecutionTimeMeasuringTest.kt b/core/commonTest/src/stress/ExecutionTimeMeasuringTest.kt
@@ -8,8 +8,9 @@ package tests.stress
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.time.*
+import kotlin.time.Duration.Companion.seconds
 
-@UseExperimental(ExperimentalTime::class)
+@OptIn(ExperimentalTime::class)
 abstract class ExecutionTimeMeasuringTest {
     private var clockMark: TimeMark? = null
 
diff --git a/core/commonTest/src/stress/list/PersistentListBuilderTest.kt b/core/commonTest/src/stress/list/PersistentListBuilderTest.kt
@@ -19,7 +19,7 @@ import kotlin.random.nextInt
 import kotlin.test.*
 import kotlin.time.ExperimentalTime
 
-@UseExperimental(ExperimentalTime::class)
+@OptIn(ExperimentalTime::class)
 class PersistentListBuilderTest : ExecutionTimeMeasuringTest() {
 
     @Test
@@ -622,7 +622,7 @@ class PersistentListBuilderTest : ExecutionTimeMeasuringTest() {
             vectorGen.add( builders.map { it.build() } )
             expected.add(lists)
 
-            val maxSize = builders.maxBy { it.size }?.size
+            val maxSize = builders.maxOf { it.size }
             println("Largest persistent list builder size: $maxSize")
         }
 
diff --git a/core/commonTest/src/stress/list/PersistentListTest.kt b/core/commonTest/src/stress/list/PersistentListTest.kt
@@ -444,7 +444,7 @@ class PersistentListTest : ExecutionTimeMeasuringTest() {
 
             assertEquals<List<*>>(lists, vectors)
 
-            val maxSize = vectors.maxBy { it.size }?.size
+            val maxSize = vectors.maxOf { it.size }
             println("Largest persistent list size: $maxSize")
 
             lists.forEachIndexed { index, list ->
diff --git a/core/commonTest/src/stress/map/PersistentHashMapBuilderTest.kt b/core/commonTest/src/stress/map/PersistentHashMapBuilderTest.kt
@@ -479,7 +479,7 @@ class PersistentHashMapBuilderTest : ExecutionTimeMeasuringTest() {
             mapGen.add( builders.map { it.build() } )
             expected.add(maps)
 
-            val maxSize = builders.maxBy { it.size }?.size
+            val maxSize = builders.maxOf { it.size }
             println("Largest persistent map builder size: $maxSize")
         }
 
diff --git a/core/commonTest/src/stress/map/PersistentHashMapTest.kt b/core/commonTest/src/stress/map/PersistentHashMapTest.kt
@@ -334,7 +334,7 @@ class PersistentHashMapTest : ExecutionTimeMeasuringTest() {
 
             assertEquals<List<*>>(mutableMaps, immutableMaps)
 
-            val maxSize = immutableMaps.maxBy { it.size }?.size
+            val maxSize = immutableMaps.maxOf { it.size }
             println("Largest persistent map size: $maxSize")
 
             mutableMaps.forEachIndexed { index, mutableMap ->
diff --git a/core/commonTest/src/stress/set/PersistentHashSetBuilderTest.kt b/core/commonTest/src/stress/set/PersistentHashSetBuilderTest.kt
@@ -300,7 +300,7 @@ class PersistentHashSetBuilderTest : ExecutionTimeMeasuringTest() {
             setGen.add( builders.map { it.build() } )
             expected.add(sets)
 
-            val maxSize = builders.maxBy { it.size }?.size
+            val maxSize = builders.maxOf { it.size }
             println("Largest persistent set builder size: $maxSize")
         }
 
diff --git a/core/commonTest/src/stress/set/PersistentHashSetTest.kt b/core/commonTest/src/stress/set/PersistentHashSetTest.kt
@@ -271,7 +271,7 @@ class PersistentHashSetTest : ExecutionTimeMeasuringTest() {
 
             assertEquals<List<*>>(mutableSets, immutableSets)
 
-            val maxSize = immutableSets.maxBy { it.size }?.size
+            val maxSize = immutableSets.maxOf { it.size }
             println("Largest persistent set size: $maxSize")
 
             mutableSets.forEachIndexed { index, mutableSet ->
diff --git a/core/jsMain/src/internal/commonFunctions.kt b/core/jsMain/src/internal/commonFunctions.kt
@@ -13,4 +13,4 @@ internal actual fun assert(condition: Boolean) {
 
 internal actual var AbstractMutableList<*>.modCount: Int
     get() = 0
-    set(value) {}
+    set(@Suppress("UNUSED_PARAMETER") value) {}
diff --git a/core/nativeMain/src/internal/commonFunctions.kt b/core/nativeMain/src/internal/commonFunctions.kt
@@ -10,4 +10,4 @@ internal actual fun assert(condition: Boolean) = kotlin.assert(condition)
 
 internal actual var AbstractMutableList<*>.modCount: Int
     get() = 0
-    set(value) {}
+    set(@Suppress("UNUSED_PARAMETER") value) {}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`dependencies {`
`3`		`- classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30")`
	`3`	`+ classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0")`
`4`	`4`	`}`
`5`	`5`	`}`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,10 @@ class TrieIteratorTest {`
`40`	`40`	`leaves = newLeaves`
`41`	`41`	`}`
`42`	`42`
`43`		`- assert(leaves.size == 1)`
`44`		`- return leaves[0] as Array<Any?>`
	`43`	`+ check(leaves.size == 1)`
	`44`	`+`
	`45`	`+ @Suppress("UNCHECKED_CAST")`
	`46`	`+ return leaves.single() as Array<Any?>`
`45`	`47`	`}`
`46`	`48`
`47`	`49`	`@Test`