Skip to content

Fix Coil3 with Ktor3 #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
opatry merged 2 commits into from
Oct 11, 2024
Merged

Fix Coil3 with Ktor3 #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06ac27a
Fix Coil3 dependency to ktor following switch to ktor 3
opatry Oct 11, 2024
79ca987
Migrate desktop app root dir to ~/.taskfolio
opatry Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
4 changes: 2 additions & 2 deletions tasks-app-android/src/main/assets/licenses_android.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1877,15 +1877,15 @@
]
},
{
"uniqueId": "io.coil-kt.coil3:coil-network-ktor2-android",
"uniqueId": "io.coil-kt.coil3:coil-network-ktor3-android",
"developers": [
{
"name": "Coil Contributors"
}
],
"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"
]
Expand Down
2 changes: 1 addition & 1 deletion tasks-app-desktop/src/main/resources/licenses_desktop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
Expand Down
7 changes: 6 additions & 1 deletion tasks-app-shared/src/jvmMain/kotlin/net/opatry/tasks/app/di/platformModule.jvm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down