Add Ktlint

.editorconfig

@@ -0,0 +1,5 @@
+root = true
+
+[*.kt]
+ij_kotlin_allow_trailing_comma = false
+ij_kotlin_allow_trailing_comma_on_call_site = false

build.gradle.kts

@@ -1,18 +1,31 @@
 plugins {
-    kotlin("multiplatform").version("1.9.20").apply(false)
+    kotlin("multiplatform").version("1.9.21").apply(false)
+    id("com.diffplug.spotless") version "6.23.3"
 }
 
 buildscript {
     repositories {
         mavenCentral()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-serialization:1.9.20")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20")
+        classpath("org.jetbrains.kotlin:kotlin-serialization:1.9.21")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21")
         classpath("com.codingfeline.buildkonfig:buildkonfig-gradle-plugin:0.15.0")
     }
 }
 
-tasks.register("clean", Delete::class) {
-    delete(rootProject.buildDir)
+allprojects {
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+    }
+
+    apply(plugin = "com.diffplug.spotless")
+
+    spotless {
+        kotlin {
+            target("**/*.kt")
+            ktlint("1.0.1")
+        }
+    }
 }

macOS/Arrivals.xcodeproj/project.pbxproj

@@ -461,7 +461,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 0.2;
+				MARKETING_VERSION = 0.3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",
@@ -505,7 +505,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 0.2;
+				MARKETING_VERSION = 0.3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-framework",

shared/build.gradle.kts

@@ -20,14 +20,14 @@ kotlin {
     }
 
     sourceSets {
-        val ktorVersion = "2.2.1"
+        val ktorVersion = "2.3.7"
 
         commonMain.dependencies {
             implementation("io.ktor:ktor-client-core:${ktorVersion}")
             implementation("io.ktor:ktor-client-content-negotiation:${ktorVersion}")
             implementation("io.ktor:ktor-serialization-kotlinx-json:${ktorVersion}")
             implementation("io.ktor:ktor-client-logging:${ktorVersion}")
-            implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4-native-mt")
+            implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
         }
 
         commonTest.dependencies {

shared/src/commonMain/kotlin/com/jdamcd/tflarrivals/Arrivals.kt

@@ -4,7 +4,6 @@ import kotlin.coroutines.cancellation.CancellationException
 import kotlin.math.roundToInt
 
 class Arrivals {
-
     private val api = TflApi()
     private val settings = Settings()
 
@@ -14,7 +13,9 @@ class Arrivals {
             val model = formatArrivals(api.fetchArrivals(settings.selectedStopId))
             if (model.arrivals.isNotEmpty()) {
                 return model
-            } else throw NoDataException("No arrivals found")
+            } else {
+                throw NoDataException("No arrivals found")
+            }
         } catch (e: Exception) {
             throw NoDataException(e.message.orEmpty())
         }
@@ -28,31 +29,42 @@ class Arrivals {
 
     suspend fun stopDetails(id: String): StopDetails {
         val stopPoint = api.stopDetails(id)
-        return StopDetails(stopPoint.naptanId, stopPoint.commonName,
+        return StopDetails(
+            stopPoint.naptanId,
+            stopPoint.commonName,
             stopPoint.children
                 .filter { it.stopType == "NaptanMetroStation" || it.stopType == "NaptanRailStation" }
                 .map { StopResult(it.naptanId, it.commonName) }
         )
     }
 
     private fun formatArrivals(apiArrivals: List<ApiArrival>): ArrivalsInfo {
-        val arrivals = apiArrivals
-            .sortedBy { it.timeToStation }
-            .filter {
-                if (settings.platformFilter.isEmpty()) true
-                else it.platformName.contains(settings.platformFilter, ignoreCase = true)
-            }
-            .filter { arrival ->
-                if (settings.directionFilter == SettingsConfig.DIRECTION_FILTER_DEFAULT) true
-                else arrival.direction.contains(settings.directionFilter) }
-            .take(3)
-            .map {
-                Arrival(
-                    it.hashCode(), // DLR arrivals all have the same ID?!
-                    formatStation(it.destinationName),
-                    formatTime(it.timeToStation)
-                )
-            }
+        val arrivals =
+            apiArrivals
+                .sortedBy { it.timeToStation }
+                .filter {
+                    if (settings.platformFilter.isEmpty()) {
+                        true
+                    } else {
+                        it.platformName.contains(settings.platformFilter, ignoreCase = true)
+                    }
+                }
+                .filter { arrival ->
+                    if (settings.directionFilter == SettingsConfig.DIRECTION_FILTER_DEFAULT) {
+                        true
+                    } else {
+                        arrival.direction.contains(settings.directionFilter)
+                    }
+                }
+                .take(3)
+                .map {
+                    Arrival(
+                        // DLR arrivals all have the same ID, so use hash
+                        it.hashCode(),
+                        formatStation(it.destinationName),
+                        formatTime(it.timeToStation)
+                    )
+                }
         return ArrivalsInfo(
             station = stationInfo(),
             arrivals = arrivals
@@ -95,17 +107,20 @@ data class StopDetails(
     val children: List<StopResult>
 )
 
-class NoDataException(message: String): Throwable(message = message)
+class NoDataException(message: String) : Throwable(message = message)
 
 private fun formatTime(seconds: Int) =
-    if (seconds < 60) "Due"
-    else "${(seconds / 60f).roundToInt()} min"
+    if (seconds < 60) {
+        "Due"
+    } else {
+        "${(seconds / 60f).roundToInt()} min"
+    }
 
-private fun formatStation(name: String) = name
-    .replace("Rail Station", "")
-    .replace("Underground Station", "")
-    .replace("DLR Station", "")
-    .trim()
+private fun formatStation(name: String) =
+    name
+        .replace("Rail Station", "")
+        .replace("Underground Station", "")
+        .replace("DLR Station", "")
+        .trim()
 
-private fun formatDirection(direction: String) =
-    direction.replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }
+private fun formatDirection(direction: String) = direction.replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }

shared/src/commonMain/kotlin/com/jdamcd/tflarrivals/Settings.kt

@@ -19,4 +19,4 @@ object SettingsConfig {
     const val PLATFORM_FILTER_DEFAULT = "Platform 2"
     const val DIRECTION_FILTER = "direction_filter"
     const val DIRECTION_FILTER_DEFAULT = "all"
-}
+}

shared/src/commonMain/kotlin/com/jdamcd/tflarrivals/TflApi.kt

@@ -13,25 +13,25 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 
 internal class TflApi {
-
-    private val client = HttpClient {
-        install(HttpTimeout) {
-            requestTimeoutMillis = 10_000 // 10 seconds
-        }
-        install(ContentNegotiation) {
-            json(
-                Json {
-                    isLenient = true
-                    ignoreUnknownKeys = true
+    private val client =
+        HttpClient {
+            install(HttpTimeout) {
+                requestTimeoutMillis = 10_000 // 10 seconds
+            }
+            install(ContentNegotiation) {
+                json(
+                    Json {
+                        isLenient = true
+                        ignoreUnknownKeys = true
+                    }
+                )
+            }
+            if (DEBUG) {
+                install(Logging) {
+                    level = LogLevel.ALL
                 }
-            )
-        }
-        if (DEBUG) {
-            install(Logging) {
-                level = LogLevel.ALL
             }
         }
-    }
 
     suspend fun fetchArrivals(station: String): List<ApiArrival> {
         return client.get("$BASE_URL/StopPoint/$station/Arrivals") {

shared/src/macOSMain/kotlin/com/jdamcd/tflarrivals/Settings.kt

@@ -12,22 +12,29 @@ import com.jdamcd.tflarrivals.SettingsConfig.STORE_NAME
 import platform.Foundation.NSUserDefaults
 
 actual class Settings actual constructor() {
-
     private val defaults: NSUserDefaults = NSUserDefaults(suiteName = STORE_NAME)
 
     actual var selectedStopName: String
         get() = defaults.stringForKey(SELECTED_STOP_NAME) ?: SELECTED_STOP_NAME_DEFAULT
-        set(value) { defaults.setObject(value, SELECTED_STOP_NAME) }
+        set(value) {
+            defaults.setObject(value, SELECTED_STOP_NAME)
+        }
 
     actual var selectedStopId: String
         get() = defaults.stringForKey(SELECTED_STOP_ID) ?: SELECTED_STOP_ID_DEFAULT
-        set(value) { defaults.setObject(value, SELECTED_STOP_ID) }
+        set(value) {
+            defaults.setObject(value, SELECTED_STOP_ID)
+        }
 
     actual var platformFilter: String
         get() = defaults.stringForKey(PLATFORM_FILTER) ?: PLATFORM_FILTER_DEFAULT
-        set(value) { defaults.setObject(value, PLATFORM_FILTER) }
+        set(value) {
+            defaults.setObject(value, PLATFORM_FILTER)
+        }
 
     actual var directionFilter: String
         get() = defaults.stringForKey(DIRECTION_FILTER) ?: DIRECTION_FILTER_DEFAULT
-        set(value) { defaults.setObject(value, DIRECTION_FILTER) }
+        set(value) {
+            defaults.setObject(value, DIRECTION_FILTER)
+        }
 }