From c15bf627c1bb4b233afa0570834f3c2ad2342074 Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Thu, 22 Feb 2024 17:41:45 +0100 Subject: [PATCH] Fixed build when not using cross --- build.gradle.kts | 4 ++-- src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 1834039..4a0b445 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -236,7 +236,7 @@ fun buildRust() { binary, "build", "--release", "--features=uniffi/cli", ) - if (currentOs() == OS.LINUX) { + if (currentOs() == OS.LINUX && useCross) { if (isLinuxAarch64) { params.add("--target=$linuxArmTarget") } else { @@ -252,7 +252,7 @@ fun buildRust() { fun copyRustBuild() { val outputDir = "${buildDir}/classes/kotlin/main" - val workingDirPath = if (currentOs() == OS.LINUX) { + val workingDirPath = if (currentOs() == OS.LINUX && useCross) { if (isLinuxAarch64) { "rs/target/$linuxArmTarget/release" } else { diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt index d568267..32d41bc 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt @@ -466,7 +466,6 @@ fun CommitsList( val xScroll = pointerEvent.changes.map { it.scrollDelta.x }.sum() horizontalScrollState.scrollBy(xScroll * HORIZONTAL_SCROLL_PIXELS_MULTIPLIER) } - println(pointerEvent) }, ) { if (