From 56928057e0de9e01f9fb61dd2d94ab36b829b95d Mon Sep 17 00:00:00 2001
From: Abe Pazos <abe@hamoid.com>
Date: Thu, 14 Nov 2024 16:50:03 +0100
Subject: [PATCH] Update boofcv, netty, ktor dependencies

boofcv 1.1.6 to 1.1.7
netty 4.1.114.Final to 4.1.115.Final
ktor 2.3.12 to 3.0.1

Fix related deprecations in orx-rabbit-control
---
 gradle/libs.versions.toml                                 | 6 +++---
 .../src/demo/kotlin/DemoRabbitControl.kt                  | 1 -
 .../src/demo/kotlin/DemoRabbitControlManualOverlay.kt     | 3 +--
 .../orx-rabbit-control/src/demo/kotlin/DemoRabbitHole.kt  | 1 -
 .../src/main/kotlin/RabbitControlServer.kt                | 8 +++-----
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a3dbbc09..8b2cdd20 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ kotest = "5.9.1"
 dokka = "1.7.10"
 nebulaRelease = "18.0.7"
 gradleNexusPublish = "2.0.0"
-boofcv = "1.1.6"
+boofcv = "1.1.7"
 kluent = "1.73"
 junitJupiter = "5.11.2"
 slf4j = "2.0.16"
@@ -22,10 +22,10 @@ antlr = "4.13.2"
 antlrKotlin = "1.0.1"
 tensorflow = "0.5.0"
 minim = "2.2.2"
-netty = "4.1.114.Final"
+netty = "4.1.115.Final"
 rabbitcontrol = "0.3.39"
 zxing = "3.5.3"
-ktor = "2.3.12"
+ktor = "3.0.1"
 jgit = "7.0.0.202409031743-r"
 javaosc = "0.9"
 jsoup = "1.18.1"
diff --git a/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitControl.kt b/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitControl.kt
index bc2d4bf6..0fc754cb 100644
--- a/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitControl.kt
+++ b/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitControl.kt
@@ -1,7 +1,6 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.loadFont
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.parameters.*
 import org.openrndr.math.Vector2
 import org.openrndr.math.Vector3
diff --git a/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitControlManualOverlay.kt b/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitControlManualOverlay.kt
index 42c70272..e404a0dd 100644
--- a/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitControlManualOverlay.kt
+++ b/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitControlManualOverlay.kt
@@ -1,8 +1,7 @@
 import org.openrndr.KEY_HOME
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
-import org.openrndr.extensions.SingleScreenshot
-import org.openrndr.extra.parameters.*
+import org.openrndr.extra.parameters.BooleanParameter
 
 
 fun main() = application {
diff --git a/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitHole.kt b/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitHole.kt
index d1c03d00..a10c02d0 100644
--- a/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitHole.kt
+++ b/orx-jvm/orx-rabbit-control/src/demo/kotlin/DemoRabbitHole.kt
@@ -1,7 +1,6 @@
 import org.openrndr.application
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.loadFont
-import org.openrndr.extensions.SingleScreenshot
 import org.openrndr.extra.parameters.*
 import org.openrndr.math.Vector2
 import org.openrndr.math.Vector3
diff --git a/orx-jvm/orx-rabbit-control/src/main/kotlin/RabbitControlServer.kt b/orx-jvm/orx-rabbit-control/src/main/kotlin/RabbitControlServer.kt
index 33b10fdd..1b0e9c41 100644
--- a/orx-jvm/orx-rabbit-control/src/main/kotlin/RabbitControlServer.kt
+++ b/orx-jvm/orx-rabbit-control/src/main/kotlin/RabbitControlServer.kt
@@ -87,13 +87,11 @@ class RabbitControlServer(private val showQRUntilClientConnects: Boolean = true,
          */
         val server = embeddedServer(Netty, port = staticFilesPort) {
             routing {
-                static("/rabbit-client") {
-                    resources("rabbit-client")
-                }
+                staticResources("/rabbit-client", "rabbit-client")
             }
         }
         server.start()
-        webServer = server
+        webServer = server.engine
 
         /**
          * Print the address
@@ -108,7 +106,7 @@ class RabbitControlServer(private val showQRUntilClientConnects: Boolean = true,
         /**
          * Update the object when it has been updated in RabbitControl
          */
-        rabbitServer.setUpdateListener {
+        rabbitServer.addUpdateListener {
             val (obj, orxParameter) = parameterMap[it]!!
             when(it) {
                 is Int32Parameter -> {