From e30cb5acdc8bebbf46e11358cf6c98d7f2ba9948 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 23:39:49 +0000 Subject: [PATCH 1/2] chore(deps): update plugin.ktfmt to v0.16.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f128c2ca..53ddd45d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,7 +24,7 @@ agp = "8.2.1" plugin_dependencyAnalysis = "1.29.0" plugin_googleServices = "4.4.0" plugin_gradleDoctor = "0.9.1" -plugin_ktfmt = "0.13.0" +plugin_ktfmt = "0.16.0" plugin_moduleGraphAssertion = "2.5.0" plugin_taskTree = "2.1.1" From 95583006947182b8932d069d6b97012329a4b7f0 Mon Sep 17 00:00:00 2001 From: Joseph Cooper <2599295+grodin@users.noreply.github.com> Date: Tue, 23 Jan 2024 17:25:23 +0000 Subject: [PATCH 2/2] style: Apply ktfmt --- .../omricat/maplibrarian/debugdrawer/DebugDrawerModules.kt | 4 ++-- .../kotlin/com/omricat/maplibrarian/utils/LogErrorAndMap.kt | 1 - util/logging/src/main/kotlin/com/omricat/logging/Loggable.kt | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/debug/kotlin/com/omricat/maplibrarian/debugdrawer/DebugDrawerModules.kt b/app/src/debug/kotlin/com/omricat/maplibrarian/debugdrawer/DebugDrawerModules.kt index 1ee5e5d1..3a1fe698 100644 --- a/app/src/debug/kotlin/com/omricat/maplibrarian/debugdrawer/DebugDrawerModules.kt +++ b/app/src/debug/kotlin/com/omricat/maplibrarian/debugdrawer/DebugDrawerModules.kt @@ -56,7 +56,7 @@ internal object DebugDrawerModules { Timber.i("Restarting app to reflect updated emulator connection settings") ProcessPhoenix.triggerRebirth(context) }, - initialHost = runBlocking { debugPreferences.emulatorHost.value() } - ?: "(No host set)" + initialHost = + runBlocking { debugPreferences.emulatorHost.value() } ?: "(No host set)" ) } diff --git a/app/src/main/kotlin/com/omricat/maplibrarian/utils/LogErrorAndMap.kt b/app/src/main/kotlin/com/omricat/maplibrarian/utils/LogErrorAndMap.kt index 014e473e..3adaabb2 100644 --- a/app/src/main/kotlin/com/omricat/maplibrarian/utils/LogErrorAndMap.kt +++ b/app/src/main/kotlin/com/omricat/maplibrarian/utils/LogErrorAndMap.kt @@ -8,7 +8,6 @@ import com.omricat.logging.Loggable import com.omricat.logging.log context(Loggable) - inline fun Result.logAndMapException( transform: (T) -> E ): Result = this.onFailure { logger.log(Warn, throwable = it) { "" } }.mapError(transform) diff --git a/util/logging/src/main/kotlin/com/omricat/logging/Loggable.kt b/util/logging/src/main/kotlin/com/omricat/logging/Loggable.kt index a9c5e4b1..757b0ed3 100644 --- a/util/logging/src/main/kotlin/com/omricat/logging/Loggable.kt +++ b/util/logging/src/main/kotlin/com/omricat/logging/Loggable.kt @@ -10,7 +10,6 @@ public interface Loggable { } context(Loggable) - public inline fun T.log( priority: Severity = Debug, tag: String? = null, @@ -20,7 +19,6 @@ public inline fun T.log( } context(Loggable) - public inline fun T.log( priority: Severity = Debug, tag: String? = null,