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

Refactor: Improve GitHub release workflow and build configuration (#2251)

Browse source
This commit is contained in:
James Rich 2025-06-25 23:16:55 +00:00 • committed by GitHub
parent d507161bde
commit 496de47766
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 284 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/build.gradle.kts
View file

@ -72,11 +72,9 @@ android {
}
create("google") {
dimension = "default"
if (Configs.USE_CRASHLYTICS) {
// Enable Firebase Crashlytics for Google Play builds
apply(plugin = libs.plugins.google.services.get().pluginId)
apply(plugin = libs.plugins.firebase.crashlytics.get().pluginId)
}
// Enable Firebase Crashlytics for Google Play builds
apply(plugin = libs.plugins.google.services.get().pluginId)
apply(plugin = libs.plugins.firebase.crashlytics.get().pluginId)
}
}
buildTypes {
@ -126,7 +124,7 @@ android {
aidl = true
buildConfig = true
}
// Configure the build-logic plugins to target JDK 17
// Configure the build-logic plugins to target JDK 21
// This matches the JDK used to build the project, and is not related to what is running on device.
compileOptions {
sourceCompatibility = JavaVersion.VERSION_21
@ -144,7 +142,9 @@ android {
kotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_21 // match Java 21
jvmToolchain {
JvmTarget.JVM_21
}
freeCompilerArgs.addAll(
"-opt-in=kotlin.RequiresOptIn",
"-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",

4
app/src/main/java/com/geeksville/mesh/database/dao/PacketDao.kt
View file

@ -85,6 +85,7 @@ interface PacketDao {
@Upsert
suspend fun insert(packet: Packet)
@Transaction
@Query(
"""
SELECT * FROM packet
@ -93,7 +94,6 @@ interface PacketDao {
ORDER BY received_time DESC
"""
)
@Transaction
fun getMessagesFrom(contact: String): Flow<List<PacketEntity>>
@Query(
@ -164,6 +164,7 @@ interface PacketDao {
)
suspend fun getDataPackets(): List<DataPacket>
@Transaction
@Query(
"""
SELECT * FROM packet
@ -174,6 +175,7 @@ interface PacketDao {
)
suspend fun getPacketById(requestId: Int): Packet?
@Transaction
@Query("SELECT * FROM packet WHERE packet_id = :packetId LIMIT 1")
suspend fun getPacketByPacketId(packetId: Int): PacketEntity?