Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
#Gradle
org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
org.gradle.jvmargs=-Xmx4096M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
org.gradle.caching=true
org.gradle.configuration-cache=true

#Kotlin
kotlin.code.style=official
kotlin.native.cacheKind=none
kotlin.daemon.jvmargs=-Xmx4096M


#Android
android.useAndroidX=true
Expand Down
10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
android-gradle-plugin = "8.10.0"
kotlin = "2.1.21"
kotlin = "2.2.0"
compose = "1.5.4"
compose-material3 = "1.1.2"
androidx-activity-compose = "1.8.0"
Expand All @@ -18,9 +18,9 @@ compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", versi
compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "compose" }
compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "compose-material3" }
desugar-jdk-libs = { group = "com.android.tools", name = "desugar_jdk_libs", version = "2.0.4" }
kmp-viewmodel-core = { group = "com.rickclephas.kmp", name = "kmp-observableviewmodel-core", version = "1.0.0-BETA-7" }
kmp-viewmodel-core = { group = "com.rickclephas.kmp", name = "kmp-observableviewmodel-core", version = "1.0.0-BETA-12" }
kermit-logging = { group = "co.touchlab", name = "kermit", version = "2.0.4" }
kmp-io = { group = "io.github.skolson", name = "kmp-io", version = "0.1.9" }
kmp-io = { group = "io.github.skolson", name = "kmp-io", version = "0.2.0" }
kfs-watch = { group = "io.github.irgaly.kfswatch", name = "kfswatch", version = "1.3.0" }
kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version = "0.6.2" }
multiplatform-settings = { group = "com.russhwolf", name = "multiplatform-settings", version = "1.3.0" }
Expand Down Expand Up @@ -65,8 +65,8 @@ kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
sonarqube = { id = "org.sonarqube", version = "6.2.0.5505" }
sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight-plugin" }
ksp = { id = "com.google.devtools.ksp", version = "2.1.21-2.0.1" }
native-coroutines = { id = "com.rickclephas.kmp.nativecoroutines", version = "1.0.0-ALPHA-43" }
ksp = { id = "com.google.devtools.ksp", version = "2.2.0-2.0.2" }
native-coroutines = { id = "com.rickclephas.kmp.nativecoroutines", version = "1.0.0-ALPHA-45" }
plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version = "2.1.21" }

[bundles]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,18 +244,7 @@ open class VariantViewModel(

val path = File(_libraryDirectory)
val contents =
path.directoryList()
.map {
Log.debug(TAG, "Looking for file ${it}")
var file = File(it)
if (!file.exists) {
Log.debug(TAG, "${it} not found, checking for ${_libraryDirectory}/${it}")
file = File("${_libraryDirectory}/${it}")
} else {
Log.debug(TAG, "Found it!")
}
file
}
path.directoryFiles()
.filter { !it.isDirectory }
.filter { it.size.toLong() > 0L }
.filter { it.extension.equals("cbz") || it.extension.equals("cbr") }
Expand Down