From 5776244541d92d754ac27564210cef51c456c057 Mon Sep 17 00:00:00 2001 From: Michael Friend Date: Wed, 30 Nov 2022 16:42:19 -0500 Subject: [PATCH 1/4] pass a static string as the message and pass message as a replacement arg (#294) (cherry picked from commit ea05457d4e5b062f1cf1cc9b2e68f61aab810606) --- kermit/src/darwinMain/kotlin/co/touchlab/kermit/OSLogWriter.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/kermit/src/darwinMain/kotlin/co/touchlab/kermit/OSLogWriter.kt b/kermit/src/darwinMain/kotlin/co/touchlab/kermit/OSLogWriter.kt index 3fd34387..94114817 100644 --- 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){ From f21eb812aed9810fdd39d683f0eb537387cfdbeb Mon Sep 17 00:00:00 2001 From: Jigar Brahmbhatt Date: Tue, 3 Oct 2023 17:59:09 -0400 Subject: [PATCH 2/4] Bump up version --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 73957701..03263c6e 100644 --- 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 \ No newline at end of file +kotlin.mpp.enableCompatibilityMetadataVariant=true From 261ff28ca7af0dd79bacafa903d2d6e9900babb5 Mon Sep 17 00:00:00 2001 From: Jigar Brahmbhatt Date: Wed, 4 Oct 2023 10:36:07 -0400 Subject: [PATCH 3/4] Attempt to fix CI build --- .github/workflows/build.yml | 5 +++++ kermit/build.gradle.kts | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fab5e0ca..8cc35109 100644 --- 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/kermit/build.gradle.kts b/kermit/build.gradle.kts index 0417e8ab..708f7544 100644 --- 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 { From e52e003b7657b16a19cfa470d1b654a82d0b414b Mon Sep 17 00:00:00 2001 From: Jigar Brahmbhatt Date: Wed, 4 Oct 2023 12:48:34 -0400 Subject: [PATCH 4/4] Attempt 2 to fix CI build --- samples/sample-production/gradle.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/samples/sample-production/gradle.properties b/samples/sample-production/gradle.properties index f9eb78b6..06f57be3 100644 --- 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 \ No newline at end of file +kotlin.native.binary.memoryModel=experimental +kotlin.native.cacheKind.iosX64=none +kotlin.native.cacheKind.iosSimulatorArm64=none \ No newline at end of file