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

This commit is contained in:
Vechro
2022-07-03 16:59:20 +03:00
committed by GitHub
parent ea38ed2473
commit a38eaa761f
9 changed files with 51 additions and 30 deletions

View File

@@ -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"))

View File

@@ -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)
}

View File

@@ -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)

View File

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

View File

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

View File

@@ -10,20 +10,20 @@ sourceSets {
dependencies {
implementation project(":orx-parameters")
implementation project(":orx-compositor")
implementation project(":orx-image-fit")
implementation project(":orx-fx")
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 'org.yaml:snakeyaml:1.30'
implementation 'io.netty:netty-all:4.1.75.Final'
implementation(libs.snakeyaml)
implementation(libs.netty.all)
implementation "cc.rabbitcontrol:rcp:0.3.26"
implementation(libs.rabbitcontrol.rcp)
implementation "com.google.zxing:core:3.4.0"
implementation "com.google.zxing:javase:3.4.0"
implementation "io.ktor:ktor-server-netty:1.3.1"
implementation(libs.zxing.core)
implementation(libs.zxing.javase)
implementation(libs.ktor.server.netty)
demoImplementation(libs.openrndr.extensions)
demoRuntimeOnly(libs.openrndr.gl3.core)

View File

@@ -1,6 +1,6 @@
java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = libs.versions.jvmTarget.get()
targetCompatibility = libs.versions.jvmTarget.get()
}
sourceSets {
demo {
@@ -20,13 +20,13 @@ sourceSets {
}
compileWrapgenKotlin {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = libs.versions.jvmTarget.get()
targetCompatibility = libs.versions.jvmTarget.get()
kotlinOptions {
jvmTarget = "1.8"
apiVersion = "1.4"
languageVersion = "1.4"
jvmTarget = libs.versions.jvmTarget.get()
apiVersion = libs.versions.kotlinApi.get()
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)
}