Merge pull request #378 from touchlab/jb/1.2.3

pass a static string as the message and pass message as a replacementarg
touchlab · Oct 5, 2023 · 7d9a411 · 7d9a411
2 parents 9d2510d + e52e003
commit 7d9a411
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -44,6 +44,11 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
+      # XCode changed naming for the watch simulators, create a simulator that matches what the tests expect (shouldn't need after 1.8)
+      - name: Create watch simulator
+        if: matrix.os == 'macOS-latest'
+        shell: bash
+        run: xcrun simctl create "Apple Watch Series 5 - 44mm" "Apple Watch Series 5 (44mm)"
       - name: Build
         env:
           S3_BUILD_CACHE_AWS_REGION: ${{ secrets.S3_BUILD_CACHE_AWS_REGION }}

diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx2g
 SONATYPE_HOST=DEFAULT
 RELEASE_SIGNING_ENABLED=true
 GROUP=co.touchlab
-VERSION_NAME=1.2.2
+VERSION_NAME=1.2.3
 KOTLIN_VERSION=1.7.20
 
 STATELY_VERSION=1.2.3
@@ -32,4 +32,4 @@ kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.native.enableDependencyPropagation=false
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.mpp.commonizerLogLevel=info
-kotlin.mpp.enableCompatibilityMetadataVariant=true
+kotlin.mpp.enableCompatibilityMetadataVariant=true
diff --git a/kermit/build.gradle.kts b/kermit/build.gradle.kts
@@ -142,7 +142,7 @@ kotlin {
         implementation("org.jetbrains.kotlin:kotlin-test")
         implementation("org.jetbrains.kotlin:kotlin-test-junit")
         implementation("androidx.test:runner:1.4.0")
-        implementation("org.robolectric:robolectric:4.5.1")
+        implementation("org.robolectric:robolectric:4.9.2")
     }
 
     commonJvmTest.dependencies {

diff --git a/kermit/src/darwinMain/kotlin/co/touchlab/kermit/OSLogWriter.kt b/kermit/src/darwinMain/kotlin/co/touchlab/kermit/OSLogWriter.kt
@@ -35,6 +35,7 @@ open class OSLogWriter : LogWriter() {
             __dso_handle.ptr,
             OS_LOG_DEFAULT,
             kermitSeverityToOsLogType(severity),
+            "%s",
             message
         )
         if(throwable != null){

diff --git a/samples/sample-production/gradle.properties b/samples/sample-production/gradle.properties
@@ -14,4 +14,6 @@ android.useAndroidX=true
 org.gradle.jvmargs=-Xmx3g
 
 # New memory model
-kotlin.native.binary.memoryModel=experimental
+kotlin.native.binary.memoryModel=experimental
+kotlin.native.cacheKind.iosX64=none
+kotlin.native.cacheKind.iosSimulatorArm64=none