feature(dependencies): upgrade kotlin, coroutines and ktor

.github/workflows/deploy-sonatype-release.yaml

@@ -1,4 +1,4 @@
-name: deploy-github-release
+name: deploy-sonatype-release
 on:
   push:
     tags: '*'

buildSrc/src/main/kotlin/Versions.kt

@@ -1,11 +1,11 @@
 object Versions {
     val adam = System.getenv("GITHUB_TAG_NAME") ?: "0.0.2"
-    val kotlin = "1.3.41"
-    val coroutines = "1.2.2"
+    val kotlin = "1.3.61"
+    val coroutines = "1.3.3"
 
     val annotations = "16.0.2"
     val kxml = "2.3.0"
-    val ktor = "1.2.3"
+    val ktor = "1.3.0"
     val logging = "1.7.6"
 
     val assertk = "0.19"

src/main/kotlin/com/malinskiy/adam/AndroidDebugBridgeServer.kt

@@ -33,7 +33,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.channels.ReceiveChannel
 import kotlinx.coroutines.channels.produce
-import kotlinx.coroutines.io.close
 import java.net.InetAddress
 import java.net.InetSocketAddress
 import kotlin.coroutines.CoroutineContext
@@ -59,7 +58,7 @@ class AndroidDebugBridgeServer(
                     }
                     return request.process(readChannel, writeChannel)
                 } finally {
-                    writeChannel?.close()
+                    writeChannel?.close(null)
                 }
             }
     }
@@ -88,7 +87,7 @@ class AndroidDebugBridgeServer(
 
                         request.close(channel)
                     } finally {
-                        writeChannel?.close()
+                        writeChannel?.close(null)
                     }
                 }
         }

src/main/kotlin/com/malinskiy/adam/extension/Channel.kt

@@ -18,8 +18,9 @@ package com.malinskiy.adam.extension
 
 import com.malinskiy.adam.transport.AndroidReadChannel
 import com.malinskiy.adam.transport.AndroidWriteChannel
-import kotlinx.coroutines.io.ByteReadChannel
-import kotlinx.coroutines.io.ByteWriteChannel
+import io.ktor.utils.io.ByteReadChannel
+import io.ktor.utils.io.ByteWriteChannel
+
 
 fun ByteReadChannel.toAndroidChannel() = AndroidReadChannel(this)
 fun ByteWriteChannel.toAndroidChannel() = AndroidWriteChannel(this)

src/main/kotlin/com/malinskiy/adam/request/sync/PullFileRequest.kt

@@ -26,8 +26,6 @@ import com.malinskiy.adam.transport.AndroidReadChannel
 import com.malinskiy.adam.transport.AndroidWriteChannel
 import io.ktor.util.cio.writeChannel
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.io.cancel
-import kotlinx.coroutines.io.close
 import java.io.File
 import kotlin.coroutines.CoroutineContext
 
@@ -94,9 +92,9 @@ class PullFileRequest(
         val header = headerBuffer.copyOfRange(0, 4)
         when {
             header.contentEquals(Const.Message.DONE) -> {
-                channel.close()
-                readChannel.cancel()
-                writeChannel.close()
+                channel.close(null)
+                readChannel.cancel(null)
+                writeChannel.close(null)
                 return 1.0
             }
             header.contentEquals(Const.Message.DATA) -> {

src/main/kotlin/com/malinskiy/adam/request/sync/PushFileRequest.kt

@@ -23,8 +23,6 @@ import com.malinskiy.adam.transport.AndroidReadChannel
 import com.malinskiy.adam.transport.AndroidWriteChannel
 import io.ktor.util.cio.readChannel
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.io.cancel
-import kotlinx.coroutines.io.close
 import java.io.File
 import kotlin.coroutines.CoroutineContext
 
@@ -65,12 +63,12 @@ class PushFileRequest(
         val available = channel.readAvailable(buffer, 8, Const.MAX_FILE_PACKET_LENGTH)
         return when {
             available < 0 -> {
-                channel.cancel()
+                channel.cancel(null)
                 Const.Message.DONE.copyInto(buffer)
                 (local.lastModified() / 1000).toInt().toByteArray().copyInto(buffer, destinationOffset = 4)
                 writeChannel.write(request = buffer, length = 8)
-                readChannel.cancel()
-                writeChannel.close()
+                readChannel.cancel(null)
+                writeChannel.close(null)
                 1.0
             }
             available > 0 -> {

src/main/kotlin/com/malinskiy/adam/request/testrunner/TestRunnerRequest.kt

@@ -20,8 +20,6 @@ import com.malinskiy.adam.Const
 import com.malinskiy.adam.request.async.AsyncChannelRequest
 import com.malinskiy.adam.transport.AndroidReadChannel
 import com.malinskiy.adam.transport.AndroidWriteChannel
-import kotlinx.coroutines.io.cancel
-import kotlinx.coroutines.io.close
 
 /**
  * @see https://android.googlesource.com/platform/frameworks/base/+/master/cmds/am/src/com/android/commands/am/Am.java#155
@@ -47,8 +45,8 @@ class TestRunnerRequest(
                 String(buffer, 0, available, Const.DEFAULT_TRANSPORT_ENCODING)
             }
             available < 0 -> {
-                readChannel.cancel()
-                writeChannel.close()
+                readChannel.cancel(null)
+                writeChannel.close(null)
                 return ""
             }
             else -> ""

src/main/kotlin/com/malinskiy/adam/transport/AndroidReadChannel.kt

@@ -19,7 +19,7 @@ package com.malinskiy.adam.transport
 import com.malinskiy.adam.Const
 import com.malinskiy.adam.log.AdamLogging
 import com.malinskiy.adam.request.TransportResponse
-import kotlinx.coroutines.io.ByteReadChannel
+import io.ktor.utils.io.ByteReadChannel
 
 class AndroidReadChannel(private val delegate: ByteReadChannel) : ByteReadChannel by delegate {
     suspend fun read(): TransportResponse {

src/main/kotlin/com/malinskiy/adam/transport/AndroidWriteChannel.kt

@@ -16,7 +16,7 @@
 
 package com.malinskiy.adam.transport
 
-import kotlinx.coroutines.io.ByteWriteChannel
+import io.ktor.utils.io.ByteWriteChannel
 import java.nio.ByteBuffer
 
 class AndroidWriteChannel(private val delegate: ByteWriteChannel) : ByteWriteChannel by delegate {