chore(deps): update plugin kotlin-qa to v0.56.0

Protelis · Dec 10, 2023 · 04ceb51 · 04ceb51
1 parent d9ef0f8
commit 04ceb51
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 17 deletions.
diff --git a/02-kotlin-helloworld/src/main/kotlin/org/protelis/demo/DeviceCapabilities.kt b/02-kotlin-helloworld/src/main/kotlin/org/protelis/demo/DeviceCapabilities.kt
@@ -16,7 +16,7 @@ class DeviceCapabilities(
     private val uid: Int,
     private val networkManager: NetworkManager,
     private val codePathFactory: CodePathFactory,
-    private val speaker: Speaker
+    private val speaker: Speaker,
 ) : AbstractExecutionContext<DeviceCapabilities>(SimpleExecutionEnvironment(), networkManager, codePathFactory),
     Speaker {
 

diff --git a/02-kotlin-helloworld/src/main/kotlin/org/protelis/demo/HelloProtelis.kt b/02-kotlin-helloworld/src/main/kotlin/org/protelis/demo/HelloProtelis.kt
@@ -37,7 +37,7 @@ object HelloProtelis {
         repeat(deviceCount) {
             g.addEdge(
                 devices[it],
-                devices[(it + 1) % deviceCount]
+                devices[(it + 1) % deviceCount],
             )
         }
         devices.forEach { (it.networkManager as EmulatedNetworkManager).neighbors = Graphs.neighborSetOf(g, it) }
@@ -46,7 +46,7 @@ object HelloProtelis {
     private fun setLeader(id: Int) =
         devices[id].deviceCapabilities.executionEnvironment.put("leader", true)
 
-    private fun syncRunNTimes(n: Int) = repeat(n) {
+    private fun syncRunNTimes(n: Int) = repeat(n) { _ ->
         devices.forEach { it.runCycle() }
     }
 }
diff --git a/02-kotlin-helloworld/src/test/kotlin/org/protelis/demo/KotlinHelloTest.kt b/02-kotlin-helloworld/src/test/kotlin/org/protelis/demo/KotlinHelloTest.kt
@@ -34,14 +34,14 @@ class KotlinHelloTest : StringSpec() {
         repeat(n) {
             g.addEdge(
                 devices[it],
-                devices[(it + 1) % n]
+                devices[(it + 1) % n],
             )
         }
         // Let every device know its neighbors and set the leader
         devices.forEach { (it.networkManager as EmulatedNetworkManager).neighbors = Graphs.neighborSetOf(g, it) }
         devices[leader].deviceCapabilities.executionEnvironment.put("leader", true)
         // Run some cycles
-        repeat(iterations) {
+        repeat(iterations) { _ ->
             devices.forEach { it.runCycle() }
         }
     }

diff --git a/04-kotlin-socket/src/main/kotlin/org/protelis/demo/HelloProtelis.kt b/04-kotlin-socket/src/main/kotlin/org/protelis/demo/HelloProtelis.kt
@@ -32,7 +32,7 @@ object HelloProtelis {
             devices += node
         }
         // Let the nodes make some iterations.
-        repeat(iterations) {
+        repeat(iterations) { _ ->
             devices.forEach { it.runCycle() }
         }
         // Close the thread listening.

diff --git a/04-kotlin-socket/src/main/kotlin/org/protelis/demo/SocketNetworkManager.kt b/04-kotlin-socket/src/main/kotlin/org/protelis/demo/SocketNetworkManager.kt
@@ -21,7 +21,7 @@ class SocketNetworkManager(
     private val uid: DeviceUID,
     private val port: Int,
     private val neighbors: Set<IPv4Host>,
-    private val address: String = "127.0.0.1"
+    private val address: String = "127.0.0.1",
 ) : NetworkManager {
     private var messages: Map<DeviceUID, Map<CodePath, Any>> = emptyMap()
     private var running = false
@@ -56,7 +56,7 @@ class SocketNetworkManager(
                             override fun failed(exc: Throwable, attachment: Any?) {
                                 exc.printStackTrace()
                             }
-                        }
+                        },
                     )
                 }
                 try {
@@ -96,8 +96,10 @@ class SocketNetworkManager(
             var client: AsynchronousSocketChannel? = null
             var oos: ObjectOutputStream? = null
             try {
-                client = AsynchronousSocketChannel.open()
-                val future = client!!.connect(InetSocketAddress(n.host, n.port))
+                client = checkNotNull(AsynchronousSocketChannel.open()) {
+                    "Cannot open an asynchronous socket channel"
+                }
+                val future = client.connect(InetSocketAddress(n.host, n.port))
                 future.get()
                 oos = ObjectOutputStream(Channels.newOutputStream(client))
                 oos.writeObject(message)

diff --git a/04-kotlin-socket/src/test/kotlin/org/protelis/demo/KotlinSocketTest.kt b/04-kotlin-socket/src/test/kotlin/org/protelis/demo/KotlinSocketTest.kt
@@ -38,7 +38,7 @@ class KotlinSocketTest : StringSpec() {
             devices += d
             speakers += s
         }
-        repeat(iterations) {
+        repeat(iterations) { _ ->
             devices.forEach { it.runCycle() }
         }
         devices.forEach { (it.networkManager as SocketNetworkManager).stop() }

diff --git a/06-kotlin-mqtt/src/main/kotlin/org/protelis/demo/HelloProtelis.kt b/06-kotlin-mqtt/src/main/kotlin/org/protelis/demo/HelloProtelis.kt
@@ -26,7 +26,7 @@ fun main() {
         devices += node
     }
     // Let the nodes make some iterations.
-    repeat(iterations) {
+    repeat(iterations) { _ ->
         devices.forEach { it.runCycle() }
     }
     // Close the thread listening.

diff --git a/06-kotlin-mqtt/src/main/kotlin/org/protelis/demo/MqttNetworkManager.kt b/06-kotlin-mqtt/src/main/kotlin/org/protelis/demo/MqttNetworkManager.kt
@@ -20,11 +20,11 @@ class MqttNetworkManager(
     address: String = defaultAddress,
     port: Int = defaultPort,
     private val qos: Int = defaultQoS,
-    private val neighbors: Set<String>
+    private val neighbors: Set<String>,
 ) : NetworkManager {
     private var messages: Map<DeviceUID, Map<CodePath, Any>> = emptyMap()
     private val broker = "tcp://$address:$port"
-    private var mqttClient = MqttAsyncClient(broker, uid.hashCode().toString(), MemoryPersistence())
+    private val mqttClient = MqttAsyncClient(broker, uid.hashCode().toString(), MemoryPersistence())
 
     /**
      * Starts the MQTT client and subscribes to the target topic.
@@ -54,7 +54,7 @@ class MqttNetworkManager(
      * Shutdowns the MQTT client.
      * @return the token to track the asynchronous task
      */
-    fun stop() = mqttClient.disconnect()
+    fun stop(): IMqttToken = mqttClient.disconnect()
 
     /**
      * Called by `ProtelisVM` during execution to send its current shared

diff --git a/06-kotlin-mqtt/src/test/kotlin/org/protelis/demo/KotlinMqttTest.kt b/06-kotlin-mqtt/src/test/kotlin/org/protelis/demo/KotlinMqttTest.kt
@@ -41,7 +41,7 @@ class KotlinMqttTest : StringSpec() {
             devices += d
             speakers += s
         }
-        repeat(iterations) {
+        repeat(iterations) { _ ->
             devices.forEach { it.runCycle() }
         }
         devices.forEach { (it.networkManager as MqttNetworkManager).stop() }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -27,6 +27,6 @@ mockito = [ "mockito-core", "mockito-junit-jupiter" ]
 gitSemVer = "org.danilopianini.git-sensitive-semantic-versioning-gradle-plugin:2.0.4"
 java-qa = "org.danilopianini.gradle-java-qa:1.28.0"
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-kotlin-qa = "org.danilopianini.gradle-kotlin-qa:0.29.2"
+kotlin-qa = "org.danilopianini.gradle-kotlin-qa:0.56.0"
 multiJvmTesting = "org.danilopianini.multi-jvm-test-plugin:0.5.6"
 shadowJar = "com.github.johnrengelman.shadow:8.1.1"