Skip to content

Commit

Permalink
migrate to refreshVersions
Browse files Browse the repository at this point in the history
  • Loading branch information
jdinkla committed Feb 10, 2024
1 parent 99fb77a commit d733c06
Show file tree
Hide file tree
Showing 10 changed files with 71 additions and 34 deletions.
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
25 changes: 9 additions & 16 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,29 +1,22 @@
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
}

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 {
Expand Down
4 changes: 4 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,8 @@ pluginManagement {
}
}

plugins {
id("de.fayard.refreshVersions") version "0.60.5"
}

rootProject.name = "from-the-ground-up-ray-tracer"
Original file line number Diff line number Diff line change
@@ -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")

Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/commonMain/kotlin/net/dinkla/raytracer/utilities/Timer.kt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -17,5 +17,5 @@ class Timer {
end = timeStamp()
}

private fun timeStamp() = DateTime.nowUnix()
private fun timeStamp() = DateTime.now().unixMillis
}
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
14 changes: 7 additions & 7 deletions src/jvmMain/kotlin/net/dinkla/raytracer/films/Film.kt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
28 changes: 28 additions & 0 deletions versions.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit d733c06

Please sign in to comment.