Merge pull request #38 from saschpe/apple-and-tests

Add more Apple ARM64 platforms: macOS, tvOS, watchOS

Author: saschpe

.github/workflows/main.yml

@@ -31,7 +31,7 @@ jobs:
         run: ./gradlew build
       - name: Archive build artifacts
         if: github.ref == 'refs/heads/main'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: log4k_build
           path: |
@@ -58,7 +58,7 @@ jobs:
           distribution: temurin
           java-version: 17
       - name: Download build artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: log4k_build
       - name: Publish to Sonatype (Maven Central)

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Changed
 - Allow empty log messages if you only want to create a log entry about a function being called.
+- Add more Apple ARM64 platforms: macOS, tvOS, watchOS
 - Dependency update:
   - [Kotlin 1.9.10](https://kotlinlang.org/docs/whatsnew19.html)
   - [Gradle-8.7](https://docs.gradle.org/8.7/release-notes.html)

log4k-slf4j/build.gradle.kts

@@ -9,14 +9,11 @@ kotlin {
     androidTarget { publishAllLibraryVariants() }
     iosArm64()
     iosSimulatorArm64()
-    js {
-        nodejs()
-        compilations.all {
-            kotlinOptions.sourceMap = true
-            kotlinOptions.moduleKind = "umd"
-        }
-    }
-    jvm { testRuns["test"].executionTask.configure { useJUnitPlatform() } }
+    js { nodejs() }
+    jvm()
+    macosArm64()
+    tvosArm64()
+    watchosArm64()
 
     applyDefaultHierarchyTemplate()
 

log4k-slf4j/src/iosMain/kotlin/saschpe/log4k/slf4j/MDC.kt log4k-slf4j/src/appleMain/kotlin/saschpe/log4k/slf4j/MDC.kt

@@ -9,14 +9,11 @@ kotlin {
     androidTarget { publishAllLibraryVariants() }
     iosArm64()
     iosSimulatorArm64()
-    js {
-        nodejs()
-        compilations.all {
-            kotlinOptions.sourceMap = true
-            kotlinOptions.moduleKind = "umd"
-        }
-    }
+    js { nodejs() }
     jvm { testRuns["test"].executionTask.configure { useJUnitPlatform() } }
+    macosArm64()
+    tvosArm64()
+    watchosArm64()
 
     applyDefaultHierarchyTemplate()
 

log4k-slf4j/src/iosMain/kotlin/saschpe/log4k/slf4j/SLF4JLogger.kt log4k-slf4j/src/appleMain/kotlin/saschpe/log4k/slf4j/SLF4JLogger.kt

@@ -0,0 +1,4 @@
+package saschpe.log4k
+
+internal actual val expectedListTag: String = "ArrayList"
+internal actual val expectedMapTag: String = "SingletonMap"

log4k/build.gradle.kts

@@ -0,0 +1,4 @@
+package saschpe.log4k
+
+internal actual val expectedListTag: String = ""
+internal actual val expectedMapTag: String = "HashMap"

log4k/src/androidUnitTest/kotlin/saschpe/log4k/LoggedTest.android.kt

@@ -1,15 +1,11 @@
 package saschpe.log4k
 
 import testing.*
-import kotlin.test.*
-
-class LogTest {
-    @BeforeTest // Arrange
-    fun before() {
-        Log.loggers.clear()
-        Log.loggers += TestLogger()
-    }
+import kotlin.test.Test
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
+class LogTest : TestLoggerTest() {
     @Test
     fun verbose() {
         // Act
@@ -172,18 +168,6 @@ class LogTest {
         assertTestLogger(Log.Level.Assert)
     }
 
-    @Test
-    fun logged_Pair() {
-        // Arrange
-        val pair = Pair("Hello", "World")
-
-        // Act
-        pair.logged()
-
-        // Assert
-        assertTestLogger(Log.Level.Debug, "(Hello, World)", "Pair", null)
-    }
-
     @Test
     fun isDebugEnabled() {
         assertTrue(Log.isDebugEnabled, "TestLogger defaults to ${Log.Level.Verbose}")
@@ -196,7 +180,4 @@ class LogTest {
         Log.loggers.clear()
         assertFalse(Log.isDebugEnabled)
     }
-
-    @AfterTest
-    fun after() = Log.loggers.clear()
 }

log4k/src/iosMain/kotlin/saschpe/log4k/ConsoleLogger.kt log4k/src/appleMain/kotlin/saschpe/log4k/ConsoleLogger.kt

@@ -0,0 +1,46 @@
+package saschpe.log4k
+
+import testing.TestLoggerTest
+import testing.assertTestLogger
+import kotlin.test.Test
+
+internal expect val expectedListTag: String
+internal expect val expectedMapTag: String
+
+class LoggedTest : TestLoggerTest() {
+    @Test
+    fun logged_Pair() {
+        // Arrange
+        val pair = Pair("Hello", "World")
+
+        // Act
+        pair.logged()
+
+        // Assert
+        assertTestLogger(Log.Level.Debug, "(Hello, World)", "Pair", null)
+    }
+
+    @Test
+    fun logged_List() {
+        // Arrange
+        val list = listOf("Hello", "World")
+
+        // Act
+        list.logged()
+
+        // Assert
+        assertTestLogger(Log.Level.Debug, "[Hello, World]", expectedListTag, null)
+    }
+
+    @Test
+    fun logged_Map() {
+        // Arrange
+        val map = mapOf("Hello" to "World")
+
+        // Act
+        map.logged()
+
+        // Assert
+        assertTestLogger(Log.Level.Debug, "{Hello=World}", expectedMapTag, null)
+    }
+}

log4k/src/appleTest/kotlin/saschpe/log4k/LoggedTest.apple.kt

@@ -0,0 +1,16 @@
+package testing
+
+import saschpe.log4k.Log
+import kotlin.test.AfterTest
+import kotlin.test.BeforeTest
+
+abstract class TestLoggerTest {
+    @BeforeTest // Arrange
+    fun before() {
+        Log.loggers.clear()
+        Log.loggers += TestLogger()
+    }
+
+    @AfterTest
+    fun after() = Log.loggers.clear()
+}

log4k/src/commonTest/kotlin/saschpe/log4k/LogTest.kt

@@ -0,0 +1,4 @@
+package saschpe.log4k
+
+internal actual val expectedListTag: String = "ArrayList"
+internal actual val expectedMapTag: String = "HashMap"

log4k/src/commonTest/kotlin/saschpe/log4k/LoggedTest.kt

@@ -0,0 +1,4 @@
+package saschpe.log4k
+
+internal actual val expectedListTag: String = "ArrayList"
+internal actual val expectedMapTag: String = "SingletonMap"