From 2c7d0d035e1607527adc6a4529ecc0848fcf37dd Mon Sep 17 00:00:00 2001 From: pahina Date: Tue, 24 Jun 2025 13:39:32 -0400 Subject: [PATCH 1/3] downgrade kotlin version --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9683311..7cd0c9b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] agp = "8.10.1" -kotlin = "2.2.0" +kotlin = "2.1.21" kotlinxDatetime = "0.6.2" dokka = "2.0.0" maven-publish = "0.33.0" From 70f38bac047b93e87bdc9084da453c147f24bee2 Mon Sep 17 00:00:00 2001 From: pahina Date: Tue, 24 Jun 2025 13:48:18 -0400 Subject: [PATCH 2/3] testing exception full --- kwhen/build.gradle.kts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kwhen/build.gradle.kts b/kwhen/build.gradle.kts index cb2e01a..34b833e 100644 --- a/kwhen/build.gradle.kts +++ b/kwhen/build.gradle.kts @@ -12,6 +12,7 @@ plugins { } + kotlin { applyDefaultHierarchyTemplate() jvm() @@ -52,6 +53,12 @@ kotlin { } +tasks.withType { + testLogging { + exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL + } +} + android { namespace = "io.github.pahinaa" compileSdk = 35 From 992a30474109c8b1bad9c4dc79875cc835679af5 Mon Sep 17 00:00:00 2001 From: pahina Date: Tue, 24 Jun 2025 13:53:19 -0400 Subject: [PATCH 3/3] remove removeLast --- .../commonMain/kotlin/ap/panini/kwhen/common/Controller.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kwhen/src/commonMain/kotlin/ap/panini/kwhen/common/Controller.kt b/kwhen/src/commonMain/kotlin/ap/panini/kwhen/common/Controller.kt index 3fe557e..00509a1 100644 --- a/kwhen/src/commonMain/kotlin/ap/panini/kwhen/common/Controller.kt +++ b/kwhen/src/commonMain/kotlin/ap/panini/kwhen/common/Controller.kt @@ -156,7 +156,7 @@ abstract class Controller(open val config: Config) { for (date in curTimes.filter { it.points != 0 }) { if (ret.isNotEmpty() && date.range.first <= ret.last().range.last + 1) { - val mergeTo = ret.removeLast() + val mergeTo = ret.removeAt(ret.size - 1) val st = if (date.tagsDayOfWeek.isNotEmpty()) { @@ -220,7 +220,7 @@ abstract class Controller(open val config: Config) { private fun dayOfWeek(start: LocalDateTime, day: DayOfWeek): LocalDateTime { var from = start.toInstant(config.timeZone) - for (i in 0..7) { + repeat(7) { val time = from.toLocalDateTime(config.timeZone) if (time.dayOfWeek == day) return time