From 06ac27a8d0c4bd182ecb24aa33d9b29ee31296ae Mon Sep 17 00:00:00 2001 From: Olivier Patry Date: Fri, 11 Oct 2024 13:21:26 +0200 Subject: [PATCH 1/2] Fix Coil3 dependency to ktor following switch to ktor 3 --- gradle/libs.versions.toml | 2 +- tasks-app-android/src/main/assets/licenses_android.json | 4 ++-- tasks-app-desktop/src/main/resources/licenses_desktop.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 636a0f68..adf160de 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -54,7 +54,7 @@ androidx-compose-m3-adaptive-layout = { module = "androidx.compose.material3.ada androidx-compose-m3-adaptive-navigation = { module = "androidx.compose.material3.adaptive:adaptive-navigation", version = "1.0.0" } coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" } -coil-network = { module = "io.coil-kt.coil3:coil-network-ktor2", version.ref = "coil" } +coil-network = { module = "io.coil-kt.coil3:coil-network-ktor3", version.ref = "coil" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.9.2" } diff --git a/tasks-app-android/src/main/assets/licenses_android.json b/tasks-app-android/src/main/assets/licenses_android.json index f5fb7982..1559ebc0 100644 --- a/tasks-app-android/src/main/assets/licenses_android.json +++ b/tasks-app-android/src/main/assets/licenses_android.json @@ -1877,7 +1877,7 @@ ] }, { - "uniqueId": "io.coil-kt.coil3:coil-network-ktor2-android", + "uniqueId": "io.coil-kt.coil3:coil-network-ktor3-android", "developers": [ { "name": "Coil Contributors" @@ -1885,7 +1885,7 @@ ], "artifactVersion": "3.0.0-alpha10", "description": "An image loading library for Android and Compose Multiplatform.", - "name": "coil-network-ktor2", + "name": "coil-network-ktor3", "licenses": [ "Apache-2.0" ] diff --git a/tasks-app-desktop/src/main/resources/licenses_desktop.json b/tasks-app-desktop/src/main/resources/licenses_desktop.json index 274cae31..31e7172f 100644 --- a/tasks-app-desktop/src/main/resources/licenses_desktop.json +++ b/tasks-app-desktop/src/main/resources/licenses_desktop.json @@ -333,7 +333,7 @@ ], "artifactVersion": "3.0.0-alpha10", "description": "An image loading library for Android and Compose Multiplatform.", - "name": "coil-network-ktor2", + "name": "coil-network-ktor3", "licenses": [ "Apache-2.0" ] From 79ca987d5aa5b558a54eaa13a922d52047136878 Mon Sep 17 00:00:00 2001 From: Olivier Patry Date: Fri, 11 Oct 2024 13:21:49 +0200 Subject: [PATCH 2/2] Migrate desktop app root dir to ~/.taskfolio --- .../kotlin/net/opatry/tasks/app/di/platformModule.jvm.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tasks-app-shared/src/jvmMain/kotlin/net/opatry/tasks/app/di/platformModule.jvm.kt b/tasks-app-shared/src/jvmMain/kotlin/net/opatry/tasks/app/di/platformModule.jvm.kt index d1ba4823..a6032b48 100644 --- a/tasks-app-shared/src/jvmMain/kotlin/net/opatry/tasks/app/di/platformModule.jvm.kt +++ b/tasks-app-shared/src/jvmMain/kotlin/net/opatry/tasks/app/di/platformModule.jvm.kt @@ -34,7 +34,12 @@ import java.io.File actual fun platformModule(): Module = module { single(named("app_root_dir")) { val userHome = File(System.getProperty("user.home")) - File(userHome, ".tasksApp") + val legacyRootDir = File(userHome, ".tasksApp") + val rootDir = File(userHome, ".taskfolio") + if (legacyRootDir.isDirectory && !rootDir.exists()) { + legacyRootDir.renameTo(rootDir) + } + rootDir } single {