Add one-off dependencies to version catalog (#245)

orx-glslify/build.gradle.kts

@@ -1,5 +1,5 @@
 dependencies {
     implementation(libs.gson)
-    implementation("org.rauschig:jarchivelib:1.0.0")
+    implementation(libs.jarchivelib)
     implementation(project(":orx-noise"))
 }

orx-jvm/orx-git-archiver/build.gradle

@@ -9,7 +9,7 @@ sourceSets {
 }
 
 dependencies {
-    implementation 'org.eclipse.jgit:org.eclipse.jgit:5.12.0.202106070339-r'
+    implementation(libs.jgit)
 
     demoImplementation(project(":orx-camera"))
     demoImplementation(project(":orx-mesh-generators"))

orx-jvm/orx-kinect-v1-demo/build.gradle.kts

@@ -3,5 +3,5 @@ dependencies {
     runtimeOnly(project(":orx-jvm:orx-kinect-v1-${(gradle as ExtensionAware).extra["openrndrClassifier"]}"))
     runtimeOnly(libs.openrndr.gl3.core)
     runtimeOnly(libs.openrndr.gl3.natives)
-    runtimeOnly("ch.qos.logback:logback-classic:1.2.11")
+    runtimeOnly(libs.logback.classic)
 }

orx-jvm/orx-minim/build.gradle.kts

@@ -16,7 +16,7 @@ dependencies {
     api(project(":orx-parameters"))
     api(project(":orx-jvm:orx-panel"))
 
-    api("net.compartmental.code:minim:2.2.2") {
+    api(libs.minim) {
         exclude(group = "org.apache.maven.plugins", module = "maven-javadoc-plugin")
     }
     implementation(libs.kotlin.reflect)

orx-jvm/orx-osc/build.gradle

@@ -1,8 +0,0 @@
-dependencies {
-    def withoutSlf4j = {
-        exclude group: 'org.slf4j'
-        exclude group: 'log4j'
-    }
-
-    implementation "com.illposed.osc:javaosc-core:0.8", withoutSlf4j
-}

orx-jvm/orx-osc/build.gradle.kts

@@ -0,0 +1,6 @@
+dependencies {
+    implementation(libs.javaosc.core) {
+        exclude(group = "org.slf4j")
+        exclude(group = "log4j")
+    }
+}

orx-jvm/orx-rabbit-control/build.gradle

@@ -10,20 +10,20 @@ sourceSets {
 
 dependencies {
 
-    implementation project(":orx-parameters")
+    implementation(project(":orx-parameters"))
-    implementation project(":orx-compositor")
+    implementation(project(":orx-compositor"))
-    implementation project(":orx-image-fit")
+    implementation(project(":orx-image-fit"))
-    implementation project(":orx-fx")
+    implementation(project(":orx-fx"))
 
     // rabbit control 0.3.26 depends on libs with vulnerabilities
-    implementation 'org.yaml:snakeyaml:1.30'
+    implementation(libs.snakeyaml)
-    implementation 'io.netty:netty-all:4.1.75.Final'
+    implementation(libs.netty.all)
 
-    implementation "cc.rabbitcontrol:rcp:0.3.26"
+    implementation(libs.rabbitcontrol.rcp)
 
-    implementation "com.google.zxing:core:3.4.0"
+    implementation(libs.zxing.core)
-    implementation "com.google.zxing:javase:3.4.0"
+    implementation(libs.zxing.javase)
-    implementation "io.ktor:ktor-server-netty:1.3.1"
+    implementation(libs.ktor.server.netty)
 
     demoImplementation(libs.openrndr.extensions)
     demoRuntimeOnly(libs.openrndr.gl3.core)

orx-jvm/orx-tensorflow/build.gradle

@@ -1,6 +1,6 @@
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = libs.versions.jvmTarget.get()
-    targetCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = libs.versions.jvmTarget.get()
 }
 sourceSets {
     demo {
@@ -20,13 +20,13 @@ sourceSets {
 }
 
 compileWrapgenKotlin {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = libs.versions.jvmTarget.get()
-    targetCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = libs.versions.jvmTarget.get()
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = libs.versions.jvmTarget.get()
-        apiVersion = "1.4"
+        apiVersion = libs.versions.kotlinApi.get()
-        languageVersion = "1.4"
+        languageVersion = libs.versions.kotlinLanguage.get()
     }
 }
 
@@ -46,5 +46,5 @@ dependencies {
     api(libs.tensorflow)
 
     // -- wrapgen
-    wrapgenImplementation 'com.github.javaparser:javaparser-core:3.15.21'
+    wrapgenImplementation(libs.javaparser.core)
 }

settings.gradle.kts

@@ -39,6 +39,17 @@ dependencyResolutionManagement {
             version("gson", "2.9.0")
             version("antlr", "4.9.3")
             version("tensorflow", "0.4.0")
+            version("jarchivelib", "1.0.0")
+            version("logbackClassic", "1.2.11")
+            version("minim", "2.2.2")
+            version("snakeyaml", "1.30")
+            version("netty", "4.1.75.Final")
+            version("rabbitcontrol", "0.3.26")
+            version("zxing", "3.4.0")
+            version("ktor", "1.3.1")
+            version("jgit", "5.12.0.202106070339-r")
+            version("javaosc", "0.8")
+            version("javaparser", "3.15.21")
 
             library("openrndr-application", "org.openrndr", "openrndr-application").versionRef("openrndr")
             library("openrndr-extensions", "org.openrndr", "openrndr-extensions").versionRef("openrndr")
@@ -58,6 +69,18 @@ dependencyResolutionManagement {
             library("boofcv", "org.boofcv", "boofcv-core").versionRef("boofcv")
             library("libfreenect", "org.bytedeco", "libfreenect").versionRef("libfreenect")
             library("librealsense", "org.bytedeco", "librealsense2").versionRef("librealsense")
+            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-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")
+            library("javaparser-core", "com.github.javaparser", "javaparser-core").versionRef("javaparser")
 
             library("kotlin-logging", "io.github.microutils", "kotlin-logging").versionRef("kotlinLogging")
             library("kotlin-coroutines", "org.jetbrains.kotlinx", "kotlinx-coroutines-core").versionRef("kotlinxCoroutines")