Skip to content

Commit 4c1c0b2

Browse files
Bump Kotlin & deps; remove Ascend time utils
Upgrade Kotlin plugins and reflect to 2.3.20, bump logback to 1.5.32 and Guava to 33.5.0-jre, and remove the dev.fruxz:ascend dependency. Remove Ascend-based time utilities and helpers from TimeExtensions (drop Duration.betterString and legacy Calendar conversions) and simplify calendarFromDateString to return a java.util.Calendar. Switch ClazzLoader to use the project's getLogger import and add /logs to .gitignore.
1 parent b5de6d0 commit 4c1c0b2

4 files changed

Lines changed: 10 additions & 22 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ bin/
3939
.DS_Store
4040
logs/latest.log
4141
/.temp
42+
/logs

build.gradle.kts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import java.util.*
22

33
plugins {
4-
kotlin("jvm") version "2.1.20"
4+
kotlin("jvm") version "2.3.20"
55
`java-library`
66
`maven-publish`
7-
kotlin("plugin.serialization") version "2.1.20"
7+
kotlin("plugin.serialization") version "2.3.20"
88
id("org.sonarqube") version "7.0.1.6134"
99
}
1010

@@ -32,13 +32,12 @@ dependencies {
3232
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
3333
api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
3434

35-
api("ch.qos.logback:logback-classic:1.5.22")
35+
api("ch.qos.logback:logback-classic:1.5.32")
3636
api("io.github.cdimascio:dotenv-kotlin:6.5.1")
37-
api("dev.fruxz:ascend:2025.7-8af65e5")
3837
api("com.google.code.gson:gson:2.13.1")
38+
api("com.google.guava:guava:33.5.0-jre")
3939

40-
api("org.jetbrains.kotlin:kotlin-reflect:2.1.20")
41-
api("com.google.guava:guava:33.4.8-jre")
40+
api("org.jetbrains.kotlin:kotlin-reflect:2.3.20")
4241
}
4342

4443
tasks {

src/main/kotlin/cc/modlabs/klassicx/extensions/TimeExtensions.kt

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package cc.modlabs.klassicx.extensions
22

3-
import dev.fruxz.ascend.tool.time.TimeUnit
4-
import dev.fruxz.ascend.tool.time.calendar.Calendar
5-
import dev.fruxz.ascend.tool.time.clock.TimeDisplay
63
import java.text.SimpleDateFormat
74
import java.time.DayOfWeek
85
import java.time.LocalDateTime
@@ -17,20 +14,11 @@ fun <T> Iterable<T>.sumOf(selector: (T) -> Duration): Duration {
1714
return sum
1815
}
1916

20-
val Duration.betterString: String
21-
get() {
22-
return TimeDisplay(this).toClockString(TimeUnit.HOUR, TimeUnit.MINUTE, TimeUnit.SECOND)
23-
}
24-
2517
fun calendarFromDateString(dateFormat: String): Calendar {
26-
val cal: java.util.Calendar = java.util.Calendar.getInstance()
18+
val cal: Calendar = java.util.Calendar.getInstance()
2719
val sdf = SimpleDateFormat("dd.MM.yyyy", Locale.GERMAN)
2820
cal.time = sdf.parse(dateFormat) // all done
29-
return Calendar.fromLegacy(cal)
30-
}
31-
32-
fun Calendar.formatToDay(locale: Locale): String {
33-
return SimpleDateFormat.getDateInstance(Calendar.FormatStyle.FULL.ordinal, locale).format(javaDate)
21+
return cal
3422
}
3523

3624
fun isWeekend(): Boolean {

src/main/kotlin/cc/modlabs/klassicx/tools/ClazzLoader.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package cc.modlabs.klassicx.tools
22

3+
import cc.modlabs.klassicx.extensions.getLogger
34
import com.google.common.reflect.ClassPath
4-
import dev.fruxz.ascend.extension.logging.getThisFactoryLogger
55
import kotlin.reflect.KClass
66

77
@Suppress("UNCHECKED_CAST")
88
class ClazzLoader(private val baseName: String) {
9-
private val logger = getThisFactoryLogger()
9+
private val logger = getLogger()
1010

1111
fun <T : Any> loadClassesInPackage(
1212
packageName: String,

0 commit comments

Comments
 (0)