From dfa1f922f51a3ae9da783aa910741324dc35951c Mon Sep 17 00:00:00 2001
From: Vechro <6316604+Vechro@users.noreply.github.com>
Date: Wed, 10 Aug 2022 23:12:30 +0300
Subject: [PATCH] [orx-rabbitcontrol] Update RCP dependencies, remove unused
 ones (#255)

---
 orx-jvm/orx-rabbit-control/build.gradle               | 11 +++--------
 .../src/main/kotlin/RabbitControlServer.kt            |  9 ++++-----
 settings.gradle.kts                                   |  8 +++-----
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/orx-jvm/orx-rabbit-control/build.gradle b/orx-jvm/orx-rabbit-control/build.gradle
index bce6c528..d260a19a 100644
--- a/orx-jvm/orx-rabbit-control/build.gradle
+++ b/orx-jvm/orx-rabbit-control/build.gradle
@@ -9,24 +9,19 @@ sourceSets {
 }
 
 dependencies {
-
     implementation(project(":orx-parameters"))
     implementation(project(":orx-compositor"))
     implementation(project(":orx-image-fit"))
     implementation(project(":orx-fx"))
 
-    // rabbit control 0.3.26 depends on libs with vulnerabilities
-    implementation(libs.snakeyaml)
-    implementation(libs.netty.all)
-
     implementation(libs.rabbitcontrol.rcp)
-
+    implementation(libs.netty.all)
     implementation(libs.zxing.core)
-    implementation(libs.zxing.javase)
+    implementation(libs.ktor.server.core)
     implementation(libs.ktor.server.netty)
 
     demoImplementation(libs.openrndr.extensions)
     demoRuntimeOnly(libs.openrndr.gl3.core)
     demoRuntimeOnly(libs.openrndr.gl3.natives)
     demoImplementation(sourceSets.getByName("main").output)
-}
+}
\ No newline at end of file
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 f6a40d2b..23bf76ee 100644
--- a/orx-jvm/orx-rabbit-control/src/main/kotlin/RabbitControlServer.kt
+++ b/orx-jvm/orx-rabbit-control/src/main/kotlin/RabbitControlServer.kt
@@ -1,21 +1,20 @@
 import com.google.zxing.BarcodeFormat
 import com.google.zxing.qrcode.QRCodeWriter
-import io.ktor.http.content.resources
-import io.ktor.http.content.static
-import io.ktor.routing.routing
 import io.ktor.server.engine.*
+import io.ktor.server.http.content.*
 import io.ktor.server.netty.*
+import io.ktor.server.routing.*
 import org.openrndr.Extension
 import org.openrndr.Program
 import org.openrndr.color.ColorRGBa
 import org.openrndr.draw.*
 import org.openrndr.extra.compositor.*
 import org.openrndr.extra.fx.blend.Darken
+import org.openrndr.extra.imageFit.FitMethod
+import org.openrndr.extra.imageFit.imageFit
 import org.openrndr.extra.parameters.Parameter
 import org.openrndr.extra.parameters.ParameterType
 import org.openrndr.extra.parameters.listParameters
-import org.openrndr.extra.imageFit.FitMethod
-import org.openrndr.extra.imageFit.imageFit
 import org.openrndr.math.Vector2
 import org.openrndr.math.Vector3
 import org.openrndr.math.Vector4
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2f633ad3..5ee5b2f8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -42,11 +42,10 @@ dependencyResolutionManagement {
             version("jarchivelib", "1.0.0")
             version("logbackClassic", "1.2.11")
             version("minim", "2.2.2")
-            version("snakeyaml", "1.30")
-            version("netty", "4.1.78.Final")
+            version("netty", "4.1.79.Final")
             version("rabbitcontrol", "0.3.29")
             version("zxing", "3.5.0")
-            version("ktor", "1.3.1")
+            version("ktor", "2.0.3")
             version("jgit", "5.12.0.202106070339-r")
             version("javaosc", "0.8")
             version("javaparser", "3.15.21")
@@ -72,11 +71,10 @@ dependencyResolutionManagement {
             library("jarchivelib", "org.rauschig", "jarchivelib").versionRef("jarchivelib")
             library("logback-classic", "ch.qos.logback", "logback-classic").versionRef("logbackClassic")
             library("minim", "net.compartmental.code", "minim").versionRef("minim")
-            library("snakeyaml", "org.yaml", "snakeyaml").versionRef("snakeyaml")
             library("netty-all", "io.netty", "netty-all").versionRef("netty")
             library("rabbitcontrol-rcp", "cc.rabbitcontrol", "rcp").versionRef("rabbitcontrol")
             library("zxing-core", "com.google.zxing", "core").versionRef("zxing")
-            library("zxing-javase", "com.google.zxing", "javase").versionRef("zxing")
+            library("ktor-server-core", "io.ktor", "ktor-server-core").versionRef("ktor")
             library("ktor-server-netty", "io.ktor", "ktor-server-netty").versionRef("ktor")
             library("jgit", "org.eclipse.jgit", "org.eclipse.jgit").versionRef("jgit")
             library("javaosc-core", "com.illposed.osc", "javaosc-core").versionRef("javaosc")