Julian/Gitnuro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed build when not using cross

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2024-02-22 17:41:45 +01:00
parent 55730886d2
commit c15bf627c1
No known key found for this signature in database
GPG Key ID: 7587FC860F594869
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@ -236,7 +236,7 @@ fun buildRust() {
binary, "build", "--release", "--features=uniffi/cli", binary, "build", "--release", "--features=uniffi/cli",
) )
if (currentOs() == OS.LINUX) { if (currentOs() == OS.LINUX && useCross) {
if (isLinuxAarch64) { if (isLinuxAarch64) {
params.add("--target=$linuxArmTarget") params.add("--target=$linuxArmTarget")
} else { } else {
@ -252,7 +252,7 @@ fun buildRust() {
fun copyRustBuild() { fun copyRustBuild() {
val outputDir = "${buildDir}/classes/kotlin/main" val outputDir = "${buildDir}/classes/kotlin/main"
val workingDirPath = if (currentOs() == OS.LINUX) { val workingDirPath = if (currentOs() == OS.LINUX && useCross) {
if (isLinuxAarch64) { if (isLinuxAarch64) {
"rs/target/$linuxArmTarget/release" "rs/target/$linuxArmTarget/release"
} else { } else {

1
src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt
View File

@ -466,7 +466,6 @@ fun CommitsList(
val xScroll = pointerEvent.changes.map { it.scrollDelta.x }.sum() val xScroll = pointerEvent.changes.map { it.scrollDelta.x }.sum()
horizontalScrollState.scrollBy(xScroll * HORIZONTAL_SCROLL_PIXELS_MULTIPLIER) horizontalScrollState.scrollBy(xScroll * HORIZONTAL_SCROLL_PIXELS_MULTIPLIER)
} }
println(pointerEvent)
}, },
) { ) {
if ( if (