build fixes

Author: oshai

gradle.properties

@@ -6,3 +6,4 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
 kotlin.mpp.applyDefaultHierarchyTemplate=false
 # Allow inconsistent JVM targets: Kotlin targets 1.8 (for compatibility), but module-info.java requires 9+.
 kotlin.jvm.target.validation.mode=warning
+kotlin.mpp.enableCInteropCommonization=true

src/darwinMain/kotlin/io/github/oshai/kotlinlogging/DarwinKLogger.kt

@@ -9,8 +9,6 @@ import platform.darwin.OS_LOG_TYPE_DEBUG
 import platform.darwin.OS_LOG_TYPE_DEFAULT
 import platform.darwin.OS_LOG_TYPE_ERROR
 import platform.darwin.OS_LOG_TYPE_INFO
-import platform.darwin.__dso_handle
-import platform.darwin._os_log_internal
 import platform.darwin.os_log_t
 import platform.darwin.os_log_type_enabled
 import platform.darwin.os_log_type_t
@@ -22,18 +20,16 @@ public class DarwinKLogger(override val name: String, override val underlyingLog
     if (isLoggingEnabledFor(level, marker)) {
       KLoggingEventBuilder().apply(block).run {
         val message = DarwinFormatter.getFormattedMessage(this, marker)
-        val formattedMessage = if (marker != null) {
-          // Separating marker and message because OSLog doesn't have a way to pass marker as a separate argument
-          // formatting manually to string for now
-          marker.toString() + " " + message
-        } else {
-          message
-        }
-        kotlin_logging_os_log(
-          underlyingLogger,
-          level.toDarwinLevel(),
-          formattedMessage,
-        )
+        val formattedMessage =
+          if (marker != null) {
+            // Separating marker and message because OSLog doesn't have a way to pass marker as a
+            // separate argument
+            // formatting manually to string for now
+            "$marker $message"
+          } else {
+            message
+          }
+        kotlin_logging_os_log(underlyingLogger, level.toDarwinLevel(), formattedMessage)
       }
     }
   }

src/darwinTest/kotlin/io/github/oshai/kotlinlogging/Issue588Test.kt

@@ -1,8 +1,7 @@
 package io.github.oshai.kotlinlogging
 
-import platform.Foundation.NSUUID
 import kotlin.test.Test
-import kotlin.test.assertTrue
+import platform.Foundation.NSUUID
 
 class Issue588Test {
   @Test
@@ -13,5 +12,4 @@ class Issue588Test {
     logger.info { "Test message execution $uuid" }
     logger.error { "Test error execution $uuid" }
   }
-  }
 }