meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "ci: Integrate Conveyor for cross-platform desktop packaging and simplify build" (#4804)

Browse source
This commit is contained in:
James Rich 2026-03-14 13:25:28 -05:00 • committed by GitHub
parent e29fd596b6
commit 513dcc2f78
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 86 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gradle/libs.versions.toml
View file

@ -62,7 +62,7 @@ vico = "3.0.3"
dependency-guard = "0.5.0"
nordic-ble = "2.0.0-alpha16"
nordic-common = "2.9.2"
conveyor = "2.0"
[libraries]
# AndroidX
@ -135,13 +135,6 @@ compose-multiplatform-resources = { module = "org.jetbrains.compose.components:c
compose-multiplatform-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "compose-multiplatform" }
compose-multiplatform-materialIconsExtended = { module = "org.jetbrains.compose.material:material-icons-extended", version = "1.7.3" }
# Compose Desktop Native Distributions
compose-multiplatform-desktop-linux-x64 = { module = "org.jetbrains.compose.desktop:desktop-jvm-linux-x64", version.ref = "compose-multiplatform" }
compose-multiplatform-desktop-linux-arm64 = { module = "org.jetbrains.compose.desktop:desktop-jvm-linux-arm64", version.ref = "compose-multiplatform" }
compose-multiplatform-desktop-macos-x64 = { module = "org.jetbrains.compose.desktop:desktop-jvm-macos-x64", version.ref = "compose-multiplatform" }
compose-multiplatform-desktop-macos-arm64 = { module = "org.jetbrains.compose.desktop:desktop-jvm-macos-arm64", version.ref = "compose-multiplatform" }
compose-multiplatform-desktop-windows-x64 = { module = "org.jetbrains.compose.desktop:desktop-jvm-windows-x64", version.ref = "compose-multiplatform" }
# JetBrains Material 3 Adaptive (multiplatform — Android, Desktop, iOS)
jetbrains-compose-material3-adaptive = { module = "org.jetbrains.compose.material3.adaptive:adaptive", version.ref = "jetbrains-adaptive" }
jetbrains-compose-material3-adaptive-layout = { module = "org.jetbrains.compose.material3.adaptive:adaptive-layout", version.ref = "jetbrains-adaptive" }
@ -267,7 +260,6 @@ spotless-gradlePlugin = { module = "com.diffplug.spotless:spotless-plugin-gradle
test-retry-gradlePlugin = { module = "org.gradle:test-retry-gradle-plugin", version.ref = "testRetry" }
[plugins]
conveyor = { id = "dev.hydraulic.conveyor", version.ref = "conveyor" }
# Android
android-application = { id = "com.android.application", version.ref = "agp" }
android-kotlin-multiplatform-library = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" }