Project tidy up

.circleci/config.yml

@@ -53,6 +53,9 @@ jobs:
           command: |
             sudo apt-get update
             sudo apt-get install fakeroot
+      - run:
+          name: "Run lint check"
+          command: ./gradlew ktlintCheck
       - run:
           name: "Run test"
           command: ./gradlew test
@@ -66,8 +69,8 @@ jobs:
           command: mkdir -p artifacts; cp -r ~/repo/build/compose/logs/* artifacts/
           when: always
       - run:
-           name: "Store deb to workspace"
-           command: cp ~/repo/build/compose/binaries/main/deb/* artifacts/
+          name: "Store deb to workspace"
+          command: cp ~/repo/build/compose/binaries/main/deb/* artifacts/
       - write_cache_linux
       - persist_to_workspace:
           root: artifacts
@@ -83,7 +86,7 @@ jobs:
       - checkout
       - read_cache_mac
       - attach_workspace:
-            at: artifacts
+          at: artifacts
       - run:
           name: "Decode signing cert"
           command: base64 -D -o cert.p12 \<<< $SIGNING_CERT_TEMP

build.gradle.kts

@@ -17,8 +17,9 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.8.20"
-    id("org.jetbrains.compose") version "1.6.0"
+    kotlin("jvm") version "2.0.20"
+    id("org.jetbrains.compose") version "1.6.11"
+    id("org.jetbrains.kotlin.plugin.compose") version "2.0.20"
     id("org.jlleitschuh.gradle.ktlint") version "11.3.2"
 }
 
@@ -71,7 +72,6 @@ dependencies {
     implementation("org.jetbrains.compose.material:material-icons-extended:$composeVersion")
     implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlinVersion")
     implementation("org.jetbrains.kotlin:kotlin-script-runtime:$kotlinVersion")
-    implementation("org.jetbrains.kotlin:kotlin-script-util:$kotlinVersion")
     implementation("org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:$kotlinVersion")
     implementation("org.jetbrains.kotlin:kotlin-scripting-jsr223:$kotlinVersion")
     implementation("org.jetbrains.kotlin:kotlin-scripting-jvm-host:$kotlinVersion")
@@ -127,9 +127,9 @@ ktlint {
 }
 
 tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-        allWarningsAsErrors = true
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+        allWarningsAsErrors.set(true)
     }
 }
 
@@ -151,9 +151,9 @@ val copyCommonProtoJarToResources by tasks.creating(Copy::class) {
     filteredFiles.forEach { file ->
         val originalFileName = file.name
         val newFileName = if (originalFileName.endsWith("$googleCommonProtos.jar")) {
-            originalFileName.replace("$googleCommonProtos", "original")
+            originalFileName.replace(googleCommonProtos, "original")
         } else {
-            originalFileName.replace("$protoktVersion", "protoKT")
+            originalFileName.replace(protoktVersion, "protoKT")
         }
         rename(originalFileName, newFileName)
     }

gradle.properties

@@ -1,15 +1,15 @@
-assertJVersion=3.24.2
-composeVersion=1.6.0
-googleCommonProtos=2.17.0
-jacksonVersion=2.15.0
-jUnitVersion=5.9.3
-kotlinVersion=1.8.20
+assertJVersion=3.26.3
+composeVersion=1.6.11
+googleCommonProtos=2.45.1
+jacksonVersion=2.18.0
+jUnitVersion=5.11.1
+kotlinVersion=2.0.20
 kotlin.code.style=official
-mockkVersion=1.13.5
-protobufUtils=3.22.3
-protoktVersion=0.10.2
-pulsarVersion=2.11.1
+mockkVersion=1.13.12
+protobufUtils=4.28.2
+protoktVersion=0.12.1
+pulsarVersion=3.3.1
 reflectionsVersion=0.10.2
-rsyntaxVersion=3.3.3
-sl4jNoop=2.0.7
-testContainerPulsar=1.18.0
+rsyntaxVersion=3.5.1
+sl4jNoop=2.0.16
+testContainerPulsar=1.20.1

src/main/kotlin/com/toasttab/pulseman/Main.kt

@@ -81,6 +81,7 @@ fun main() = application {
                     appState.save(true)
                     exitApplication()
                 }
+
                 JOptionPane.NO_OPTION -> {
                     exitApplication()
                 }

src/main/kotlin/com/toasttab/pulseman/files/FileManagement.kt

@@ -70,8 +70,9 @@ object FileManagement {
     fun makeFolder(file: File) {
         val path: Path = Paths.get(file.toURI())
         Files.createDirectories(path)
-        if (!file.exists() && !file.mkdir())
+        if (!file.exists() && !file.mkdir()) {
             throw Exception(FAILED_TO_CREATE_DIRECTORY)
+        }
     }
 
     fun addFileDialog(jarFolder: File, action: (File) -> Unit) {
@@ -92,8 +93,9 @@ object FileManagement {
     }
 
     fun deleteFile(file: File) {
-        if (file.exists())
+        if (file.exists()) {
             file.delete()
+        }
     }
 
     fun saveProject(tabsJson: String, quickSave: Boolean, jarFolders: List<File>) {
@@ -132,7 +134,7 @@ object FileManagement {
                 title = PROJECT_FILE_DIALOG_TITLE,
                 mode = FileDialogMode.LOAD,
                 extensionFilters = listOf(ZIP_EXTENSION),
-                directory = projectFolder.absolutePath,
+                directory = projectFolder.absolutePath
             )
 
             fileDialog.show()
@@ -150,7 +152,9 @@ object FileManagement {
         if (it.exists()) {
             val lastLoadedFile = File(it.readText())
             if (lastLoadedFile.exists()) lastLoadedFile else null
-        } else null
+        } else {
+            null
+        }
     }
 
     fun loadedJars(jarFolder: File) = jarFolder.walk().filter { it.isFile }.toMutableSet()

src/main/kotlin/com/toasttab/pulseman/pulsar/MessageHandlingClassImpl.kt

@@ -23,8 +23,8 @@ import com.toasttab.pulseman.AppStrings.PROPERTIES
 import com.toasttab.pulseman.entities.ReceivedMessages
 import com.toasttab.pulseman.entities.SingleSelection
 import com.toasttab.pulseman.pulsar.handlers.PulsarMessageClassInfo
-import java.time.Instant
 import org.apache.pulsar.client.api.Message
+import java.time.Instant
 
 /**
  * This class handles printing received pulsar messages and logs the related class info

src/main/kotlin/com/toasttab/pulseman/pulsar/Pulsar.kt

@@ -33,9 +33,6 @@ import com.toasttab.pulseman.AppStrings.SERVICE_URL_NOT_SET
 import com.toasttab.pulseman.AppStrings.TOPIC_NOT_SET
 import com.toasttab.pulseman.jars.RunTimeJarLoader.addJarsToClassLoader
 import com.toasttab.pulseman.state.PulsarSettings
-import java.util.UUID
-import java.util.concurrent.CompletableFuture
-import java.util.concurrent.TimeUnit
 import org.apache.pulsar.client.api.Authentication
 import org.apache.pulsar.client.api.Consumer
 import org.apache.pulsar.client.api.Message
@@ -45,6 +42,9 @@ import org.apache.pulsar.client.api.PulsarClient
 import org.apache.pulsar.client.api.Schema
 import org.apache.pulsar.client.api.SubscriptionMode
 import org.apache.pulsar.client.api.SubscriptionType
+import java.util.UUID
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.TimeUnit
 
 /**
  * Handles
@@ -156,8 +156,9 @@ class Pulsar(
             setUserFeedback(NO_CLASS_GENERATED_TO_SEND)
             wrongSettings = true
         }
-        if (wrongSettings)
+        if (wrongSettings) {
             return false
+        }
 
         try {
             (producer ?: createNewProducer(topic))

src/main/kotlin/com/toasttab/pulseman/pulsar/PulsarConfig.kt

@@ -18,8 +18,8 @@ package com.toasttab.pulseman.pulsar
 import com.toasttab.pulseman.AppStrings.EXCEPTION
 import com.toasttab.pulseman.AppStrings.FAILED_TO_RETRIEVE_TOPICS
 import com.toasttab.pulseman.state.PulsarSettings
-import java.util.concurrent.TimeUnit
 import org.apache.pulsar.client.admin.PulsarAdmin
+import java.util.concurrent.TimeUnit
 
 /**
  * Handles connecting to pulsar admin and retrieving a list of topics, this is currently limited to unauthenticated
@@ -28,7 +28,6 @@ import org.apache.pulsar.client.admin.PulsarAdmin
 class PulsarConfig(private val setUserFeedback: (String) -> Unit) {
     fun getTopics(pulsarUrl: String, pulsarSettings: PulsarSettings): List<String> {
         try {
-
             val builder = PulsarAdmin.builder()
 
             PulsarAuth(pulsarSettings).getAuthHandler()?.let { authHandler ->

src/main/kotlin/com/toasttab/pulseman/pulsar/handlers/protobuf/KTMessageHandler.kt

@@ -61,8 +61,9 @@ data class KTMessageHandler(override val cls: Class<out KtMessage>, override val
                 it.name !in IGNORE_FIELDS
             }
             .forEach {
-                if (!it.type.isPrimitive)
+                if (!it.type.isPrimitive) {
                     importSet.add(it.type.name.replace("$", "."))
+                }
                 variables.appendLine("\t${it.name} = //$TODO")
             }
         val imports = StringBuilder()

src/main/kotlin/com/toasttab/pulseman/scripting/KotlinScripting.kt

@@ -111,4 +111,3 @@ object KotlinScripting {
 
     private const val KTS_EXTENSION = "kts"
 }
-

src/main/kotlin/com/toasttab/pulseman/state/AuthSelector.kt

@@ -57,9 +57,11 @@ class AuthSelector(
 
     private fun onSelectedAuthClass(newValue: PulsarAuthHandler) {
         selectedAuthClass.selected =
-            if (selectedAuthClass.selected == newValue)
+            if (selectedAuthClass.selected == newValue) {
                 null
-            else newValue
+            } else {
+                newValue
+            }
         setUserFeedback("$SELECTED ${newValue.cls.name}")
         onChange()
     }

src/main/kotlin/com/toasttab/pulseman/state/ReceiveMessage.kt

@@ -31,13 +31,13 @@ import com.toasttab.pulseman.jars.RunTimeJarLoader.addJarsToClassLoader
 import com.toasttab.pulseman.pulsar.MessageHandling
 import com.toasttab.pulseman.pulsar.Pulsar
 import com.toasttab.pulseman.view.receiveMessageUI
-import java.util.concurrent.CompletableFuture
-import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import org.apache.pulsar.client.api.Consumer
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.TimeUnit
 
 class ReceiveMessage(
     private val setUserFeedback: (String) -> Unit,

src/main/kotlin/com/toasttab/pulseman/state/protocol/protobuf/ConvertType.kt

@@ -33,6 +33,7 @@ enum class ConvertType {
                     .map { it.toInt(16).toByte() }
                     .toByteArray()
             }
+
             BASE64 -> {
                 value
                     .filter { !it.isWhitespace() }

src/main/kotlin/com/toasttab/pulseman/util/FileDialog.kt

@@ -25,7 +25,7 @@ class FileDialog(
     mode: FileDialogMode,
     directory: String? = null,
     file: String? = null,
-    private val extensionFilters: List<String> = emptyList(),
+    private val extensionFilters: List<String> = emptyList()
 ) {
     private val fileDialog: AwtFileDialog = AwtFileDialog(Frame(), title, mode.ordinal)
 

src/main/kotlin/com/toasttab/pulseman/view/AuthSelectorUI.kt

@@ -162,10 +162,11 @@ fun authSelectorUI(
                                             onSelectedAuthClass(classInfo)
                                         }
                                     ) {
-                                        if (selectedAuthClass === classInfo)
+                                        if (selectedAuthClass === classInfo) {
                                             Icon(Icons.Default.CheckCircle, SELECTED_CLASS)
-                                        else
+                                        } else {
                                             Icon(Icons.Default.Clear, CLICK_TO_SELECT)
+                                        }
                                     }
                                 }
                             }

src/main/kotlin/com/toasttab/pulseman/view/JarManagementUI.kt

@@ -54,7 +54,7 @@ fun jarManagementUI(
     loadedJars: List<File>,
     jarFolder: File,
     onRemoveJar: (File) -> Unit,
-    onAddJar: (File) -> Unit,
+    onAddJar: (File) -> Unit
 ) {
     Surface {
         Box {

src/main/kotlin/com/toasttab/pulseman/view/MessageClassSelectorUI.kt

@@ -132,10 +132,11 @@ fun messageClassSelectorUI(
                                     modifier = Modifier.weight(0.1F),
                                     onClick = { onSelectedClass(classInfo) }
                                 ) {
-                                    if (selectedClass === classInfo)
+                                    if (selectedClass === classInfo) {
                                         Icon(Icons.Default.RadioButtonChecked, SELECTED_CLASS)
-                                    else
+                                    } else {
                                         Icon(Icons.Default.RadioButtonUnchecked, CLICK_TO_SELECT)
+                                    }
                                 }
                             }
                         }

src/main/kotlin/com/toasttab/pulseman/view/PulsarSettingsUI.kt

@@ -104,7 +104,7 @@ fun pulsarSettingsUI(
         Row {
             Button(
                 modifier = Modifier.padding(4.dp),
-                onClick = { onShowJarManagementChange(true) },
+                onClick = { onShowJarManagementChange(true) }
             ) {
                 Text(JARS)
             }
@@ -122,7 +122,7 @@ fun pulsarSettingsUI(
 
             Button(
                 modifier = Modifier.padding(4.dp),
-                onClick = { onShowAuthSettingsChange(true) },
+                onClick = { onShowAuthSettingsChange(true) }
             ) {
                 Text(AUTH_SETTINGS)
             }
@@ -140,7 +140,7 @@ fun pulsarSettingsUI(
 
             Button(
                 modifier = Modifier.padding(4.dp),
-                onClick = { onShowPropertySettingsChange(true) },
+                onClick = { onShowPropertySettingsChange(true) }
             ) {
                 Text(PROPERTIES)
             }

src/main/kotlin/com/toasttab/pulseman/view/ReceiveMessageUI.kt

@@ -123,18 +123,19 @@ fun receiveMessageUI(
 
                                 Text(
                                     text = AnnotatedString(receivedMessage.header),
-                                    modifier = Modifier.weight(1F).align(Alignment.CenterVertically),
+                                    modifier = Modifier.weight(1F).align(Alignment.CenterVertically)
                                 )
 
                                 Spacer(modifier = Modifier.width(8.dp))
 
                                 IconButton(
                                     onClick = { receivedMessage.expanded.value = !receivedMessage.expanded.value }
                                 ) {
-                                    if (receivedMessage.expanded.value)
+                                    if (receivedMessage.expanded.value) {
                                         Icon(Icons.Default.ArrowDropUp, contentDescription = COLLAPSE)
-                                    else
+                                    } else {
                                         Icon(Icons.Default.ArrowDropDown, contentDescription = EXPAND)
+                                    }
                                 }
 
                                 Spacer(modifier = Modifier.width(8.dp))