Sync from next

gradle.properties

@@ -1,8 +1,8 @@
 # sytleguide
 kotlin.code.style=official
 
-# Kotlin 1.5.0: https://github.com/korlibs/easy-kotlin-mpp-gradle-plugin
-easyPluginVersion=0.15.2
+# Kotlin 1.5.20: https://github.com/korlibs/easy-kotlin-mpp-gradle-plugin
+easyPluginVersion=0.16.0
 
 # version
 group=com.soywiz.korlibs.krypto

gradle/wrapper/gradle-wrapper.properties

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

krypto/src/commonMain/kotlin/com/soywiz/krypto/Hasher.kt

@@ -4,7 +4,7 @@ import com.soywiz.krypto.encoding.Base64
 import com.soywiz.krypto.encoding.Hex
 import com.soywiz.krypto.internal.*
 import com.soywiz.krypto.internal.arraycopy
-import com.soywiz.krypto.internal.min2
+
 import kotlin.math.min
 
 open class HasherFactory(val create: () -> Hasher) {
@@ -37,7 +37,7 @@ abstract class Hasher(val chunkSize: Int, val digestSize: Int) {
         var left = count
         while (left > 0) {
             val remainingInChunk = chunkSize - writtenInChunk
-            val toRead = min2(remainingInChunk, left)
+            val toRead = min(remainingInChunk, left)
             arraycopy(data, curr, chunk, writtenInChunk, toRead)
             left -= toRead
             curr += toRead

krypto/src/commonMain/kotlin/com/soywiz/krypto/internal/KryptoTools.kt

@@ -12,11 +12,11 @@ internal fun ByteArray.readU8(o: Int): Int = this[o].toInt() and 0xFF
 internal fun ByteArray.readS32_be(o: Int): Int =
     (readU8(o + 3) shl 0) or (readU8(o + 2) shl 8) or (readU8(o + 1) shl 16) or (readU8(o + 0) shl 24)
 
-@PublishedApi internal fun min2(a: Int, b: Int) = if (a < b) a else b
-@PublishedApi internal fun max2(a: Int, b: Int) = if (a > b) a else b
 
-@PublishedApi internal fun min2(a: Float, b: Float) = if (a < b) a else b
-@PublishedApi internal fun max2(a: Float, b: Float) = if (a > b) a else b
 
-@PublishedApi internal fun min2(a: Double, b: Double) = if (a < b) a else b
-@PublishedApi internal fun max2(a: Double, b: Double) = if (a > b) a else b
+
+
+
+
+
+