Merge pull request #1 from Ayagikei/fix_windows_cache_path

Fix windows cache path
Ayagikei · Feb 13, 2023 · cb2fdd0 · cb2fdd0
2 parents 05fed82 + 7e488b4
commit cb2fdd0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -47,7 +47,7 @@ compose.desktop {
  nativeDistributions {
  targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
  packageName = "LifeUp Desktop"
- packageVersion = "1.0.0"
+ packageVersion = "1.0.1"
  macOS {
  iconFile.set(project.file("icon.icns"))
  }

diff --git a/src/jvmMain/kotlin/base/Val.kt b/src/jvmMain/kotlin/base/Val.kt
@@ -2,9 +2,9 @@ package base
 
 object Val {
  // FIXME: get version from gradle
- val version: String = "1.0.0"
+ val version: String = "1.0.1"
 
- val targetLifeUpCloudVersion = "1.1.1+"
+ val targetLifeUpCloudVersion = "1.1.2+"
 
  val targetLifeUpAndroidVersion = "1.91.0+"
 }
diff --git a/src/jvmMain/kotlin/ui/AppStoreImpl.kt b/src/jvmMain/kotlin/ui/AppStoreImpl.kt
@@ -23,12 +23,15 @@ class AppStoreImpl(
 ) {
 
  val resourceDir
- get() = (System.getProperty("compose.application.resources.dir") ?: "").ifBlank {
+ get() = System.getenv("APPDATA").ifBlank {
+ System.getProperty("compose.application.resources.dir")
+ }.ifBlank {
  System.getProperty("user.dir")
  }
 
+
  val cacheDir
- get() = File(resourceDir, "cache").also {
+ get() = File(resourceDir + File.separator + "LifeUp Desktop" + File.separator + "cache").also {
  if (it.exists().not()) {
  it.mkdirs()
  }