fix crash

sargunv · Jan 13, 2025 · aadfc88 · aadfc88
1 parent 576c275
commit aadfc88
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
@@ -4,6 +4,7 @@ name: "Daily"
 on:
   schedule:
     - cron: "00 10 * * *"
+  workflow_dispatch:
 
 jobs:
   check-last-run:

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -62,9 +62,11 @@ spotless {
     target("**/*.kt")
     ktfmt().googleStyle()
   }
-  format("swift") {
-    target("iosApp/iosApp/**/*.swift")
-    nativeCmd("swiftFormat", "/usr/bin/env", listOf("swift", "format"))
+  if (System.getProperty("os.name").contains("Mac OS X")) {
+    format("swift") {
+      target("iosApp/iosApp/**/*.swift")
+      nativeCmd("swiftFormat", "/usr/bin/env", listOf("swift", "format"))
+    }
   }
   format("markdown") {
     target("**/*.md")

diff --git a/...-app/src/commonMain/kotlin/dev/sargunv/maplibrecompose/demoapp/demos/StyleSwitcherDemo.kt b/...-app/src/commonMain/kotlin/dev/sargunv/maplibrecompose/demoapp/demos/StyleSwitcherDemo.kt
@@ -58,17 +58,18 @@ object StyleSwitcherDemo : Demo {
               styleState = styleState,
               ornamentSettings = DemoOrnamentSettings(),
             ) {
-              val crags = rememberVectorSource(
-                id = "openbeta-crags",
-                uri = Res.getUri("files/data/openbeta-crags.json")
-              )
+              val crags =
+                rememberVectorSource(
+                  id = "openbeta-crags",
+                  uri = Res.getUri("files/data/openbeta-crags.json"),
+                )
               SymbolLayer(
                 id = "crag-name-label",
                 source = crags,
                 sourceLayer = "crags",
                 iconAnchor = const(SymbolAnchor.Center),
                 textField = feature.get("name").convertToString(),
-                textFont = const(listOf("Noto Sans Regular"))
+                textFont = const(listOf("Noto Sans Regular")),
               )
             }
             DemoMapControls(cameraState, styleState)

diff --git a/lib/maplibre-compose/src/androidMain/kotlin/dev/sargunv/maplibrecompose/core/layer/Layer.kt b/lib/maplibre-compose/src/androidMain/kotlin/dev/sargunv/maplibrecompose/core/layer/Layer.kt
@@ -6,8 +6,8 @@ import org.maplibre.android.style.layers.PropertyFactory
 
 internal actual sealed class Layer {
   abstract val impl: MlnLayer
-  actual val id: String
-    get() = impl.id
+
+  actual val id: String by lazy { impl.id }
 
   actual var minZoom: Float
     get() = impl.minZoom

diff --git a/...maplibre-compose/src/androidMain/kotlin/dev/sargunv/maplibrecompose/core/source/Source.kt b/...maplibre-compose/src/androidMain/kotlin/dev/sargunv/maplibrecompose/core/source/Source.kt
@@ -6,8 +6,8 @@ import org.maplibre.android.style.sources.Source as MLNSource
 
 public actual sealed class Source {
   internal abstract val impl: MLNSource
-  internal actual val id: String
-    get() = impl.id
+
+  internal actual val id: String by lazy { impl.id }
 
   public actual val attributionLinks: List<AttributionLink>
     get() {

diff --git a/lib/maplibre-compose/src/iosMain/kotlin/dev/sargunv/maplibrecompose/core/layer/Layer.kt b/lib/maplibre-compose/src/iosMain/kotlin/dev/sargunv/maplibrecompose/core/layer/Layer.kt
@@ -4,8 +4,7 @@ import cocoapods.MapLibre.MLNStyleLayer
 
 internal actual sealed class Layer {
   abstract val impl: MLNStyleLayer
-  actual val id: String
-    get() = impl.identifier
+  actual val id: String by lazy { impl.identifier }
 
   actual var minZoom: Float
     get() = impl.minimumZoomLevel

diff --git a/lib/maplibre-compose/src/iosMain/kotlin/dev/sargunv/maplibrecompose/core/source/Source.kt b/lib/maplibre-compose/src/iosMain/kotlin/dev/sargunv/maplibrecompose/core/source/Source.kt
@@ -6,8 +6,7 @@ import cocoapods.MapLibre.MLNTileSource
 
 public actual sealed class Source {
   internal abstract val impl: MLNSource
-  internal actual val id: String
-    get() = impl.identifier
+  internal actual val id: String by lazy { impl.identifier }
 
   public actual val attributionLinks: List<AttributionLink>
     get() =