diff --git a/README.md b/README.md index b380343..726d05b 100644 --- a/README.md +++ b/README.md @@ -108,3 +108,14 @@ The folder resources contains the following: * TwoTriangles.ply is from Kevin Suffern, the author of the book. * Isis.ply was downloaded from [Cyberware](http://cyberware.com/) (dissolved since 2011 ) + + +## Upgrade dependencies + +The project uses [refreshVersions](https://splitties.github.io/refreshVersions/) + +```sh +$ gradle refreshVersions +``` + +(c) 2010 - 2024 Jörn Dinkla https://www.dinkla.net diff --git a/build.gradle.kts b/build.gradle.kts index 8605233..f43e5bb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,13 +1,6 @@ -val kotestVersion = "5.8.0" -val coroutinesVersion = "1.7.3" -val logbackVersion = "1.4.14" -val korioVersion = "2.2.0" -val korimVersion = "2.2.0" -val cliktVersion = "4.2.1" - plugins { kotlin("jvm") version "2.0.0-Beta3" - id("io.gitlab.arturbosch.detekt") version "1.23.5" + id("io.gitlab.arturbosch.detekt") idea application } @@ -15,15 +8,15 @@ plugins { dependencies { implementation(kotlin("stdlib")) implementation(kotlin("reflect")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion") - implementation("ch.qos.logback:logback-classic:$logbackVersion") - implementation("com.soywiz.korlibs.korio:korio:$korioVersion") - implementation("com.soywiz.korlibs.korim:korim:$korimVersion") - implementation("com.github.ajalt.clikt:clikt:$cliktVersion") - implementation("io.github.classgraph:classgraph:4.8.90") + implementation(KotlinX.coroutines.core) + implementation("ch.qos.logback:logback-classic:_") + implementation("com.soywiz.korlibs.korio:korio:_") + implementation("com.soywiz.korlibs.korim:korim:_") + implementation("com.github.ajalt.clikt:clikt:_") + implementation("io.github.classgraph:classgraph:_") - testImplementation("io.kotest:kotest-runner-junit5:$kotestVersion") - testImplementation("io.kotest:kotest-assertions-core:$kotestVersion") + testImplementation(Testing.kotest.runner.junit5) + testImplementation(Testing.kotest.assertions.core) } repositories { diff --git a/settings.gradle.kts b/settings.gradle.kts index ea992fe..42adb61 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,4 +5,8 @@ pluginManagement { } } +plugins { + id("de.fayard.refreshVersions") version "0.60.5" +} + rootProject.name = "from-the-ground-up-ray-tracer" diff --git a/src/commonMain/kotlin/net/dinkla/raytracer/utilities/FilenameUtilities.kt b/src/commonMain/kotlin/net/dinkla/raytracer/utilities/FilenameUtilities.kt index fde725f..290f916 100644 --- a/src/commonMain/kotlin/net/dinkla/raytracer/utilities/FilenameUtilities.kt +++ b/src/commonMain/kotlin/net/dinkla/raytracer/utilities/FilenameUtilities.kt @@ -1,7 +1,7 @@ package net.dinkla.raytracer.utilities -import com.soywiz.klock.DateFormat -import com.soywiz.klock.DateTime +import korlibs.time.DateFormat +import korlibs.time.DateTime private val dateFormat = DateFormat("yyyyMMddHHmmss") diff --git a/src/commonMain/kotlin/net/dinkla/raytracer/utilities/Logger.kt b/src/commonMain/kotlin/net/dinkla/raytracer/utilities/Logger.kt index ed0cc89..0083436 100644 --- a/src/commonMain/kotlin/net/dinkla/raytracer/utilities/Logger.kt +++ b/src/commonMain/kotlin/net/dinkla/raytracer/utilities/Logger.kt @@ -1,7 +1,8 @@ package net.dinkla.raytracer.utilities -import com.soywiz.klock.DateFormat.Companion.FORMAT2 -import com.soywiz.klock.DateTime +import korlibs.time.DateFormat.Companion.FORMAT2 +import korlibs.time.DateTime + object Logger { enum class LogLevel { diff --git a/src/commonMain/kotlin/net/dinkla/raytracer/utilities/Timer.kt b/src/commonMain/kotlin/net/dinkla/raytracer/utilities/Timer.kt index af103bd..abeb3e7 100644 --- a/src/commonMain/kotlin/net/dinkla/raytracer/utilities/Timer.kt +++ b/src/commonMain/kotlin/net/dinkla/raytracer/utilities/Timer.kt @@ -1,6 +1,6 @@ package net.dinkla.raytracer.utilities -import com.soywiz.klock.DateTime +import korlibs.time.DateTime class Timer { private var start: Double = 0.0 @@ -17,5 +17,5 @@ class Timer { end = timeStamp() } - private fun timeStamp() = DateTime.nowUnix() + private fun timeStamp() = DateTime.now().unixMillis } diff --git a/src/commonTest/kotlin/net/dinkla/raytracer/utilities/FilenameUtilitiesTest.kt b/src/commonTest/kotlin/net/dinkla/raytracer/utilities/FilenameUtilitiesTest.kt index de5d21a..2f3fb56 100644 --- a/src/commonTest/kotlin/net/dinkla/raytracer/utilities/FilenameUtilitiesTest.kt +++ b/src/commonTest/kotlin/net/dinkla/raytracer/utilities/FilenameUtilitiesTest.kt @@ -1,15 +1,15 @@ package net.dinkla.raytracer.utilities -import com.soywiz.klock.DateTime -import com.soywiz.klock.Month -import com.soywiz.klock.Year + import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.shouldBe +import korlibs.time.Month +import korlibs.time.Year internal class FilenameUtilitiesTest : StringSpec({ val fileNameBase = "World73" - val timeStamp = DateTime(Year(2022), Month.September, 17, 17, 42, 20, 0) + val timeStamp = korlibs.time.DateTime(Year(2022), Month.September, 17, 17, 42, 20, 0) "should exchange extension" { val s = outputPngFileName("$fileNameBase.kt", timeStamp) diff --git a/src/jvmMain/kotlin/net/dinkla/raytracer/films/Film.kt b/src/jvmMain/kotlin/net/dinkla/raytracer/films/Film.kt index cd99207..ebbca76 100644 --- a/src/jvmMain/kotlin/net/dinkla/raytracer/films/Film.kt +++ b/src/jvmMain/kotlin/net/dinkla/raytracer/films/Film.kt @@ -1,12 +1,12 @@ package net.dinkla.raytracer.films -import com.soywiz.korim.bitmap.Bitmap32 -import com.soywiz.korim.color.RGBA -import com.soywiz.korim.format.PNG -import com.soywiz.korim.format.writeBitmap -import com.soywiz.korio.file.Vfs -import com.soywiz.korio.file.VfsFile -import com.soywiz.korio.file.std.localCurrentDirVfs +import korlibs.image.bitmap.Bitmap32 +import korlibs.image.color.RGBA +import korlibs.image.format.PNG +import korlibs.image.format.writeBitmap +import korlibs.io.file.Vfs +import korlibs.io.file.VfsFile +import korlibs.io.file.std.localCurrentDirVfs import net.dinkla.raytracer.colors.Color import net.dinkla.raytracer.utilities.Logger import net.dinkla.raytracer.utilities.Resolution diff --git a/src/jvmMain/kotlin/net/dinkla/raytracer/swing/FromTheGroundUpRayTracer.kt b/src/jvmMain/kotlin/net/dinkla/raytracer/swing/FromTheGroundUpRayTracer.kt index e47ee40..3460160 100644 --- a/src/jvmMain/kotlin/net/dinkla/raytracer/swing/FromTheGroundUpRayTracer.kt +++ b/src/jvmMain/kotlin/net/dinkla/raytracer/swing/FromTheGroundUpRayTracer.kt @@ -1,6 +1,6 @@ package net.dinkla.raytracer.swing -import com.soywiz.klock.DateTime +import korlibs.time.DateTime import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/versions.properties b/versions.properties new file mode 100644 index 0000000..91a9999 --- /dev/null +++ b/versions.properties @@ -0,0 +1,28 @@ +#### Dependencies and Plugin versions with their available updates. +#### Generated by `./gradlew refreshVersions` version 0.60.5 +#### +#### Don't manually edit or split the comments that start with four hashtags (####), +#### they will be overwritten by refreshVersions. +#### +#### suppress inspection "SpellCheckingInspection" for whole file +#### suppress inspection "UnusedProperty" for whole file + +version.kotlinx.coroutines=1.7.3 +## # available=1.8.0-RC +## # available=1.8.0-RC2 + +version.kotlin=2.0.0-Beta3 + +version.kotest=5.8.0 + +version.io.github.classgraph..classgraph=4.8.165 + +version.com.soywiz.korlibs.korio..korio=4.0.10 + +version.com.soywiz.korlibs.korim..korim=4.0.10 + +version.com.github.ajalt.clikt..clikt=4.2.2 + +version.ch.qos.logback..logback-classic=1.4.14 + +plugin.io.gitlab.arturbosch.detekt=1.23.5