Fix more PR feedback

Author: wenli-cai

.gitignore

@@ -37,3 +37,6 @@ local.properties
 *.iml
 .idea/
 captures/
+
+# Kotlin Metadata
+.kotlin/

gradle/libs.versions.toml

@@ -3,10 +3,7 @@
 agpVersion = "8.8.0"
 
 compileSdk = "34"
-# Any version above 0.10.0-beta03 requires Compose 1.8.0 or higher.
-filekitDialogsComposeVersion = "0.10.0-beta03"
 minSdk = "24"
-moshiKotlinVersion = "1.15.2"
 targetSdk = "33"
 
 jdk-target = "1.8"
@@ -42,6 +39,8 @@ androidx-viewbinding = "8.1.2"
 detekt = "1.19.0"
 dokka = "2.0.0"
 dependencyGuard = "0.5.0"
+# Any version above 0.10.0-beta03 requires Compose 1.8.0 or higher, beta03 is 1.7.3 or higher.
+filekit-dialogs-compose = "0.10.0-beta03"
 
 google-accompanist = "0.18.0"
 google-dagger = "2.40.5"
@@ -81,6 +80,7 @@ squareup-curtains = "1.2.5"
 squareup-cycler = "0.1.9"
 squareup-leakcanary = "3.0-alpha-8"
 squareup-moshi = "1.15.0"
+squareup-moshi-kotlin = "1.15.2"
 squareup-okhttp = "4.9.1"
 squareup-okio = "3.3.0"
 squareup-radiography = "2.4.1"
@@ -92,7 +92,6 @@ timber = "5.0.1"
 truth = "1.4.4"
 turbine = "1.0.0"
 vanniktech-publish = "0.32.0"
-uiGraphicsAndroidVersion = "1.8.2"
 
 [plugins]
 
@@ -189,7 +188,7 @@ dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", vers
 
 dropbox-dependencyGuard = { module = "com.dropbox.dependency-guard:dependency-guard", version.ref = "dependencyGuard" }
 
-filekit-dialogs-compose = { module = "io.github.vinceglb:filekit-dialogs-compose", version.ref = "filekitDialogsComposeVersion" }
+filekit-dialogs-compose = { module = "io.github.vinceglb:filekit-dialogs-compose", version.ref = "filekit-dialogs-compose" }
 google-android-material = { module = "com.google.android.material:material", version.ref = "material" }
 google-ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "google-ksp" }
 
@@ -236,7 +235,6 @@ mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "
 
 mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
 
-moshi-kotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshiKotlinVersion" }
 reactivestreams = "org.reactivestreams:reactive-streams:1.0.4"
 
 robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
@@ -256,6 +254,7 @@ squareup-leakcanary-objectwatcher-android = { module = "com.squareup.leakcanary:
 squareup-moshi = { module = "com.squareup.moshi:moshi", version.ref = "squareup-moshi" }
 squareup-moshi-adapters = { module = "com.squareup.moshi:moshi-adapters", version.ref = "squareup-moshi" }
 squareup-moshi-codegen = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "squareup-moshi" }
+squareup-moshi-kotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "squareup-moshi-kotlin" }
 
 squareup-okio = { module = "com.squareup.okio:okio", version.ref = "squareup-okio" }
 
@@ -270,6 +269,5 @@ truth = { module = "com.google.truth:truth", version.ref = "truth" }
 turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" }
 
 vanniktech-publish = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "vanniktech-publish" }
-androidx-ui-graphics-android = { group = "androidx.compose.ui", name = "ui-graphics-android", version.ref = "uiGraphicsAndroidVersion" }
 
 [bundles]

workflow-trace-viewer/README.md

@@ -12,6 +12,4 @@ It can be run via Gradle using:
 
 ### External Libraries
 
-[FileKit](https://github.com/vinceglb/FileKit) is an external library made to apply file operations 
-on Kotlin and KMP projects. It's purpose in this app is to allow developers to upload their own 
-json trace files. The motivation for its use is to quickly implement a file picker.
+[FileKit](https://github.com/vinceglb/FileKit) is an external library made to apply file operations on Kotlin and KMP projects. It's purpose in this app is to allow developers to upload their own json trace files. The motivation for its use is to quickly implement a file picker.

workflow-trace-viewer/build.gradle.kts

@@ -23,7 +23,7 @@ kotlin {
         implementation(compose.desktop.currentOs)
         implementation(libs.kotlinx.coroutines.swing)
         implementation(compose.materialIconsExtended)
-        implementation(libs.moshi.kotlin)
+        implementation(libs.squareup.moshi.kotlin)
         implementation(libs.filekit.dialogs.compose)
       }
     }

workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/App.kt

@@ -4,8 +4,10 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import io.github.vinceglb.filekit.PlatformFile
 import io.github.vinceglb.filekit.readString
@@ -18,23 +20,23 @@ public fun App(
   modifier: Modifier = Modifier
 ) {
   Box {
-    val selectedFile = remember { mutableStateOf<PlatformFile?>(null) }
+    var selectedFile by remember { mutableStateOf<PlatformFile?>(null) }
 
-    if (selectedFile.value != null) {
-      SandboxBackground { WorkflowContent(selectedFile.value) }
+    if (selectedFile != null) {
+      SandboxBackground { WorkflowContent(selectedFile!!) }
     }
 
-    UploadFile(onFileSelect = { selectedFile.value = it })
+    UploadFile(onFileSelect = { selectedFile = it })
   }
 }
 
 @Composable
-private fun WorkflowContent(file: PlatformFile?) {
-  val jsonString = remember { mutableStateOf<String?>(null) }
+private fun WorkflowContent(file: PlatformFile) {
+  var jsonString by remember { mutableStateOf<String?>(null) }
   LaunchedEffect(file) {
-    jsonString.value = file?.readString()
+    jsonString = file.readString()
   }
-  val root = jsonString.value?.let { parseTrace(it) }
+  val root = jsonString?.let { parseTrace(it) }
 
   if (root != null) {
     DrawWorkflowTree(root)

workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/WorkflowTree.kt

@@ -10,8 +10,10 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -68,16 +70,16 @@ public fun DrawWorkflowTree(
 private fun DrawNode(
   node: WorkflowNode,
 ) {
-  val open = remember { mutableStateOf(false) }
+  var open by remember { mutableStateOf(false) }
   Box(
     modifier = Modifier
-      .clickable { open.value = !open.value }
+      .clickable { open = !open }
       .padding(10.dp)
   ) {
     Column(horizontalAlignment = Alignment.CenterHorizontally) {
       Text(text = node.name)
       Text(text = "ID: ${node.id}")
-      if (open.value) {
+      if (open) {
         Text("node is opened")
       }
     }