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

Merge 0b97cb3b2c into 3322257cfd

Browse source
This commit is contained in:
James Rich 2026-04-20 07:28:34 -05:00 • committed by GitHub
commit 479546d8da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 167 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

51
desktop/build.gradle.kts
View file

@ -118,8 +118,8 @@ compose.desktop {
mainClass = "org.meshtastic.desktop.MainKt"
jvmArgs(
"-Xmx2G",
"-Dapple.awt.application.name=Meshtastic",
"-Dcom.apple.mrj.application.apple.menu.about.name=Meshtastic",
"-Dapple.awt.application.name=Meshtastic Desktop",
"-Dcom.apple.mrj.application.apple.menu.about.name=Meshtastic Desktop",
"-Dcom.apple.bundle.identifier=org.meshtastic.desktop",
)
@ -134,7 +134,7 @@ compose.desktop {
}
nativeDistributions {
packageName = "Meshtastic"
packageName = "Meshtastic Desktop"
// Ensure critical JVM modules are included in the custom JRE bundled with the app.
// jdeps might miss some of these if they are loaded via reflection or JNI.
@ -151,8 +151,8 @@ compose.desktop {
// Increase max heap size to prevent OOM issues on complex maps/data
jvmArgs(
"-Xmx2G",
"-Dapple.awt.application.name=Meshtastic",
"-Dcom.apple.mrj.application.apple.name=Meshtastic",
"-Dapple.awt.application.name=Meshtastic Desktop",
"-Dcom.apple.mrj.application.apple.menu.about.name=Meshtastic Desktop",
"-Dcom.apple.bundle.identifier=org.meshtastic.desktop",
)
@ -161,6 +161,7 @@ compose.desktop {
iconFile.set(project.file("src/main/resources/icon.icns"))
minimumSystemVersion = "12.0"
bundleID = "org.meshtastic.desktop"
appCategory = "public.app-category.utilities"
entitlementsFile.set(project.file("entitlements.plist"))
infoPlist {
extraKeysRawXml =
@ -185,22 +186,46 @@ compose.desktop {
"""
.trimIndent()
}
// TODO: To prepare for real distribution on macOS, you'll need to sign and notarize.
// You can inject these from CI environment variables.
// sign = true
// notarize = true
// appleID = System.getenv("APPLE_ID")
// appStorePassword = System.getenv("APPLE_APP_SPECIFIC_PASSWORD")
// macOS code signing and notarization.
// Required for Gatekeeper acceptance on end-user machines (without this,
// macOS 12+ shows "app cannot be opened because it is from an unidentified developer").
//
// Required CI secrets:
// APPLE_SIGNING_IDENTITY – e.g. "Developer ID Application: Meshtastic LLC (TEAMID)"
// APPLE_ID – Apple ID email used for notarization
// APPLE_APP_SPECIFIC_PASSWORD – App-specific password from appleid.apple.com
// APPLE_TEAM_ID – 10-character Apple Developer Team ID
//
// To enable, set SIGN_MACOS=true in the CI environment and uncomment the block below.
val signMacOs = System.getenv("SIGN_MACOS")?.toBoolean() ?: false
if (signMacOs) {
signing {
sign.set(true)
identity.set(System.getenv("APPLE_SIGNING_IDENTITY"))
}
notarization {
appleID.set(System.getenv("APPLE_ID"))
password.set(System.getenv("APPLE_APP_SPECIFIC_PASSWORD"))
teamID.set(System.getenv("APPLE_TEAM_ID"))
}
}
}
windows {
iconFile.set(project.file("src/main/resources/icon.ico"))
menuGroup = "Meshtastic"
// TODO: Must generate and set a consistent UUID for Windows upgrades.
// upgradeUuid = "YOUR-UPGRADE-UUID-HERE"
shortcut = true
menu = true
dirChooser = true
// Stable UUID ensures MSI upgrades replace the previous installation
// rather than installing side-by-side. NEVER change this value.
upgradeUuid = "4974EA87-98AA-470E-B590-0BD5CF9FAE8E"
}
linux {
iconFile.set(project.file("src/main/resources/icon.png"))
menuGroup = "Network"
debMaintainer = "developers@meshtastic.org"
appCategory = "Network"
rpmLicenseType = "GPLv3+"
}
// Define target formats based on the current host OS to avoid configuration errors

4
desktop/entitlements.plist
View file

@ -10,5 +10,9 @@
<true/>
<key>com.apple.security.device.bluetooth</key>
<true/>
<key>com.apple.security.network.client</key>
<true/>
<key>com.apple.security.device.usb</key>
<true/>
</dict>
</plist>