desktop: fix build (#6896)

* desktop: fix nanohttpd jitpack dependency

* desktop: make assets-dir gradle flag optional
This commit is contained in:
sh
2026-04-27 16:05:30 +00:00
committed by GitHub
parent 283ef29019
commit 17ef17cfd0
4 changed files with 21 additions and 6 deletions
+2 -2
View File
@@ -142,8 +142,8 @@ kotlin {
implementation("org.slf4j:slf4j-simple:2.0.12")
implementation("uk.co.caprica:vlcj:4.8.3")
implementation("net.java.dev.jna:jna:5.14.0")
implementation("com.github.NanoHttpd.nanohttpd:nanohttpd:efb2ebf85a")
implementation("com.github.NanoHttpd.nanohttpd:nanohttpd-websocket:efb2ebf85a")
implementation("com.github.NanoHttpd.nanohttpd:nanohttpd:efb2ebf")
implementation("com.github.NanoHttpd.nanohttpd:nanohttpd-websocket:efb2ebf")
implementation("com.squareup.okhttp3:okhttp:4.12.0")
}
}
+7 -2
View File
@@ -16,5 +16,10 @@ security unlock-keychain -p "" /tmp/simplex.keychain
security list-keychains -s `security list-keychains | xargs` /tmp/simplex.keychain
scripts/desktop/build-lib-mac.sh
cd apps/multiplatform
./gradlew -Psimplex.assets.dir="$ASSETS_DIR" packageDmg
./gradlew -Psimplex.assets.dir="$ASSETS_DIR" notarizeDmg
if [ -n "${ASSETS_DIR:-}" ]; then
set -- -Psimplex.assets.dir="$ASSETS_DIR"
else
set --
fi
./gradlew "$@" packageDmg
./gradlew "$@" notarizeDmg
+6 -1
View File
@@ -18,7 +18,12 @@ libcrypto_path=$(ldd common/src/commonMain/cpp/desktop/libs/*/libHSdirect-sqlcip
trap "rm common/src/commonMain/cpp/desktop/libs/*/`basename $libcrypto_path` 2> /dev/null || true" EXIT
cp $libcrypto_path common/src/commonMain/cpp/desktop/libs/*
./gradlew -Psimplex.assets.dir="$ASSETS_DIR" createDistributable
if [ -n "${ASSETS_DIR:-}" ]; then
set -- -Psimplex.assets.dir="$ASSETS_DIR"
else
set --
fi
./gradlew "$@" createDistributable
rm common/src/commonMain/cpp/desktop/libs/*/`basename $libcrypto_path`
rm -rf $release_app_dir/AppDir 2>/dev/null
+6 -1
View File
@@ -4,7 +4,12 @@ ARCH="$(uname -m)"
scripts/desktop/build-lib-linux.sh
cd apps/multiplatform
./gradlew -Psimplex.assets.dir="$ASSETS_DIR" packageDeb
if [ -n "${ASSETS_DIR:-}" ]; then
set -- -Psimplex.assets.dir="$ASSETS_DIR"
else
set --
fi
./gradlew "$@" packageDeb
# Workaround for skiko library
#