update kotlinx/ktor

Author: crc-32

build.gradle

@@ -18,8 +18,8 @@ plugins {
 }
 
 def klockVersion = "2.4.13"
-def ktorVersion = "1.4.0"
-def coroutinesVersion = "1.5.1-new-mm-dev2"
+def ktorVersion = "1.6.7"
+def coroutinesVersion = "1.6.0"
 
 repositories {
     mavenCentral()
@@ -48,10 +48,10 @@ publishing {
 }
 
 android { // android specific configuration
-    compileSdkVersion 29 // SDK version to compile against
+    compileSdkVersion 31 // SDK version to compile against
     defaultConfig {
         minSdkVersion 15 // min SDK version supported by this lib
-        targetSdkVersion 29 // max SDK version supported by this lib
+        targetSdkVersion 31 // max SDK version supported by this lib
         versionCode 1
         versionName getVersion()
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner' // See notes #1

src/commonMain/kotlin/io/rebble/libpebblecommon/ProtocolHandlerImpl.kt

@@ -94,7 +94,7 @@ class ProtocolHandlerImpl() : ProtocolHandler {
     }
 
     override suspend fun getNextPacketOrNull(): ProtocolHandler.PendingPacket? {
-        return normalPriorityPackets.poll() ?: lowPriorityPackets.poll()
+        return normalPriorityPackets.tryReceive().getOrNull() ?: lowPriorityPackets.tryReceive().getOrNull()
     }
 
     /**

src/commonMain/kotlin/io/rebble/libpebblecommon/services/AppFetchService.kt

@@ -23,7 +23,7 @@ class AppFetchService(private val protocolHandler: ProtocolHandler) : ProtocolSe
             throw IllegalStateException("Received invalid packet type: $packet")
         }
 
-        receivedMessages.offer(packet)
+        receivedMessages.trySend(packet)
     }
 
 }

src/commonMain/kotlin/io/rebble/libpebblecommon/services/AppLogService.kt

@@ -23,6 +23,6 @@ class AppLogService(private val protocolHandler: ProtocolHandler) : ProtocolServ
             throw IllegalStateException("Received invalid packet type: $packet")
         }
 
-        receivedMessages.offer(packet)
+        receivedMessages.trySend(packet)
     }
 }

src/commonMain/kotlin/io/rebble/libpebblecommon/services/AppReorderService.kt

@@ -31,6 +31,6 @@ class AppReorderService(private val protocolHandler: ProtocolHandler) : Protocol
         }
 
         lastOrderPacket = null
-        receivedMessages.offer(packet)
+        receivedMessages.trySend(packet)
     }
 }

src/commonMain/kotlin/io/rebble/libpebblecommon/services/MusicService.kt

@@ -22,7 +22,7 @@ class MusicService(private val protocolHandler: ProtocolHandler) : ProtocolServi
             throw IllegalStateException("Received invalid packet type: $packet")
         }
 
-        receivedMessages.offer(packet)
+        receivedMessages.trySend(packet)
     }
 
 }

src/commonMain/kotlin/io/rebble/libpebblecommon/services/PutBytesService.kt

@@ -23,7 +23,7 @@ class PutBytesService(private val protocolHandler: ProtocolHandler) : ProtocolSe
             throw IllegalStateException("Received invalid packet type: $packet")
         }
 
-        receivedMessages.offer(packet)
+        receivedMessages.trySend(packet)
     }
 
 }

src/commonMain/kotlin/io/rebble/libpebblecommon/services/ScreenshotService.kt

@@ -23,7 +23,7 @@ class ScreenshotService(private val protocolHandler: ProtocolHandler) : Protocol
             throw IllegalStateException("Received invalid packet type: $packet")
         }
 
-        receivedMessages.offer(packet)
+        receivedMessages.trySend(packet)
     }
 
 }

src/commonMain/kotlin/io/rebble/libpebblecommon/services/SystemService.kt

@@ -81,7 +81,7 @@ class SystemService(private val protocolHandler: ProtocolHandler) : ProtocolServ
                     send(res) // Cannot be low priority
                 }
             }
-            else -> receivedMessages.offer(packet)
+            else -> receivedMessages.trySend(packet)
         }
     }
 

src/commonMain/kotlin/io/rebble/libpebblecommon/services/app/AppRunStateService.kt

@@ -23,7 +23,7 @@ class AppRunStateService(private val protocolHandler: ProtocolHandler) : Protoco
             throw IllegalStateException("Received invalid packet type: $packet")
         }
 
-        receivedMessages.offer(packet)
+        receivedMessages.trySend(packet)
     }
 
 }