kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to kotlin-logging 6.0.2

Browse Source
This commit is contained in:
Edwin Jakobs
2024-01-14 18:38:46 +01:00
parent 590a2b30f5
commit f35b2f52f8
19 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-jvm.gradle.kts
View File

@@ -45,6 +45,7 @@ dependencies {
implementation(libs.kotlin.stdlib)
implementation(libs.kotlin.logging)
testImplementation(libs.kotlin.test)
testRuntimeOnly(libs.slf4j.simple)
"demoImplementation"(main.output.classesDirs + main.runtimeClasspath)
"demoImplementation"(libs.openrndr.application)
"demoImplementation"(libs.openrndr.extensions)

2
buildSrc/src/main/kotlin/org/openrndr/extra/convention/kotlin-multiplatform.gradle.kts
View File

@@ -1,6 +1,7 @@
package org.openrndr.extra.convention
import CollectScreenshotsTask
import gradle.kotlin.dsl.accessors._a37e1a3c5785f18372ed85a4dc9bbdf6.testRuntimeOnly
import org.gradle.accessors.dm.LibrariesForLibs
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -81,6 +82,7 @@ kotlin {
val jvmTest by getting {
dependencies {
runtimeOnly(libs.bundles.jupiter)
runtimeOnly(libs.slf4j.simple)
}
}

6
gradle/libs.versions.toml
View File

@@ -5,7 +5,7 @@ kotlin = "1.9.22"
jvmTarget = "11"
openrndr = { require = "[0.4.2, 0.5.0)" }
kotlinxCoroutines = "1.7.3"
kotlinLogging = "3.0.0"
kotlinLogging = "6.0.2"
kotlinxSerialization = "1.6.2"
kotest = "5.8.0"
dokka = "1.7.10"
@@ -19,7 +19,7 @@ libfreenect = "0.5.7-1.5.9"
librealsense = "2.53.1-1.5.9"
gson = "2.10.1"
antlr = "4.13.1"
antlrKotlin = "0.1.0-RC14"
antlrKotlin = "0.1.0"
tensorflow = "0.5.0"
minim = "2.2.2"
netty = "4.1.92.Final"
@@ -30,7 +30,7 @@ jgit = "6.7.0.202309050840-r"
javaosc = "0.8"
[libraries]
kotlin-logging = { group = "io.github.microutils", name = "kotlin-logging", version.ref = "kotlinLogging" }
kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version.ref = "kotlinLogging" }
kotlin-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
kotlin-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" }
kotlin-serialization-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "kotlinxSerialization" }

2
orx-compute-graph-nodes/src/jvmMain/kotlin/DrawCacheNode.kt
View File

@@ -1,6 +1,6 @@
package org.openrndr.extra.computegraph.nodes
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import org.openrndr.KEY_SPACEBAR
import org.openrndr.Program
import org.openrndr.RequestAssetsEvent

2
orx-compute-graph/src/commonMain/kotlin/ComputeGraph.kt
View File

@@ -1,7 +1,7 @@
package org.openrndr.extra.computegraph
import io.github.oshai.kotlinlogging.KotlinLogging
import kotlinx.coroutines.*
import mu.KotlinLogging
import org.openrndr.events.Event
import kotlin.contracts.ExperimentalContracts
import kotlin.contracts.InvocationKind

3
orx-jvm/orx-chataigne/src/main/kotlin/ChataigneOSC.kt
View File

@@ -1,7 +1,6 @@
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import org.openrndr.color.ColorRGBa
import org.openrndr.extra.osc.OSC
import java.awt.Color
import kotlin.reflect.KProperty
private val logger = KotlinLogging.logger {}

2
orx-jvm/orx-file-watcher/src/main/kotlin/FileWatcher.kt
View File

@@ -1,8 +1,8 @@
package org.openrndr.extra.filewatcher
import com.sun.nio.file.SensitivityWatchEventModifier
import io.github.oshai.kotlinlogging.KotlinLogging
import kotlinx.coroutines.*
import mu.KotlinLogging
import org.openrndr.events.Event
import java.io.File
import java.nio.file.FileSystems

2
orx-jvm/orx-git-archiver/src/main/kotlin/GitArchiver.kt
View File

@@ -1,6 +1,6 @@
package org.openrndr.extra.gitarchiver
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import org.openrndr.AssetMetadata
import org.openrndr.Extension
import org.openrndr.Program

2
orx-jvm/orx-gui/src/main/kotlin/Gui.kt
View File

@@ -3,7 +3,7 @@ package org.openrndr.extra.gui
import com.google.gson.Gson
import com.google.gson.JsonSyntaxException
import com.google.gson.reflect.TypeToken
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import org.openrndr.*
import org.openrndr.color.ColorRGBa
import org.openrndr.dialogs.*

2
orx-jvm/orx-kinect-v1/src/main/kotlin/Kinect1.kt
View File

@@ -1,8 +1,8 @@
package org.openrndr.extra.kinect.v1
import io.github.oshai.kotlinlogging.KotlinLogging
import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.*
import mu.KotlinLogging
import org.bytedeco.javacpp.Pointer
import org.bytedeco.libfreenect.*
import org.bytedeco.libfreenect.global.freenect.*

2
orx-jvm/orx-midi/src/main/kotlin/MidiTransceiver.kt
View File

@@ -1,6 +1,6 @@
package org.openrndr.extra.midi
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import org.openrndr.Program
import org.openrndr.events.Event
import javax.sound.midi.*

3
orx-jvm/orx-olive/src/main/kotlin/Olive.kt
View File

@@ -1,9 +1,10 @@
package org.openrndr.extra.olive
import io.github.oshai.kotlinlogging.KotlinLogging
import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.async
import mu.KotlinLogging
import org.openrndr.Extension
import org.openrndr.Program
import org.openrndr.draw.Session

2
orx-jvm/orx-olive/src/main/kotlin/Reloadable.kt
View File

@@ -1,6 +1,6 @@
package org.openrndr.extra.olive
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import kotlin.reflect.KMutableProperty1
import kotlin.reflect.KProperty1
import kotlin.reflect.full.declaredMemberProperties

2
orx-jvm/orx-olive/src/main/kotlin/ScriptObjectLoaderJSR233.kt
View File

@@ -1,6 +1,6 @@
package org.openrndr.extra.olive
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import java.io.File
import java.io.InputStream
import java.io.Reader

2
orx-jvm/orx-osc/src/main/kotlin/OSC.kt
View File

@@ -6,7 +6,7 @@ import com.illposed.osc.messageselector.OSCPatternAddressMessageSelector
import com.illposed.osc.transport.OSCPort
import com.illposed.osc.transport.OSCPortIn
import com.illposed.osc.transport.OSCPortOut
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import java.net.InetAddress
import java.net.PortUnreachableException
import kotlin.reflect.KMutableProperty0

3
orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/ControlManager.kt
View File

@@ -1,12 +1,11 @@
package org.openrndr.panel
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import org.openrndr.*
import org.openrndr.color.ColorRGBa
import org.openrndr.draw.*
import org.openrndr.math.Matrix44
import org.openrndr.math.Vector2
import org.openrndr.math.mod_
import org.openrndr.panel.elements.*
import org.openrndr.panel.layout.Layouter
import org.openrndr.panel.style.*

2
orx-jvm/orx-panel/src/main/kotlin/org/openrndr/panel/elements/Slider.kt
View File

@@ -1,7 +1,7 @@
package org.openrndr.panel.elements
import io.github.oshai.kotlinlogging.KotlinLogging
import kotlinx.coroutines.*
import mu.KotlinLogging
import org.openrndr.*
import org.openrndr.draw.Cursor
import org.openrndr.draw.Drawer

2
orx-palette/src/main/kotlin/PaletteStudio.kt
View File

@@ -1,8 +1,8 @@
package org.openrndr.extra.palette
import mu.KotlinLogging
import com.google.gson.GsonBuilder
import com.google.gson.JsonParseException
import io.github.oshai.kotlinlogging.KotlinLogging
import org.openrndr.*
import org.openrndr.extra.noise.Random
import org.openrndr.color.ColorRGBa

3
orx-shader-phrases/src/commonMain/kotlin/ShaderPreprocessor.kt
View File

@@ -1,9 +1,8 @@
package org.openrndr.extra.shaderphrases
import mu.KotlinLogging
import io.github.oshai.kotlinlogging.KotlinLogging
import org.openrndr.draw.Shader
import org.openrndr.extra.shaderphrases.ShaderPhraseRegistry.getGLSLFunctionName
//import org.openrndr.extra.shaderphrases.phrases.phraseTbnMatrix
import org.openrndr.utils.url.textFromURL
private val logger = KotlinLogging.logger {}