From c47751ad555d251125785cc64059b423e81cc1c3 Mon Sep 17 00:00:00 2001
From: Kgothatso Ngako <kgothatso@machankura.com>
Date: Tue, 23 Jun 2026 13:59:17 +0200
Subject: [PATCH] Fix to get it to build

---
 composeApp/build.gradle.kts                    |  6 +++---
 .../1.json                                     | 18 +++++++++++++++---
 .../database/dao/MarmotKeyPackageBundleDao.kt  |  2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
index 061ec511..67e8c8ec 100644
--- a/composeApp/build.gradle.kts
+++ b/composeApp/build.gradle.kts
@@ -21,7 +21,7 @@ kotlin {
 
     androidTarget {
         compilerOptions {
-            jvmTarget.set(JvmTarget.JVM_11)
+            jvmTarget.set(JvmTarget.JVM_21)
         }
     }
     
@@ -148,8 +148,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 }
 
diff --git a/composeApp/schemas/at.torch.compose.database.TorchDatabase/1.json b/composeApp/schemas/at.torch.compose.database.TorchDatabase/1.json
index f277b493..6d08baaf 100644
--- a/composeApp/schemas/at.torch.compose.database.TorchDatabase/1.json
+++ b/composeApp/schemas/at.torch.compose.database.TorchDatabase/1.json
@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "6b621966e86b542862bb89991b2b3acb",
+    "identityHash": "f33937ebefe679fe03b71b3930472139",
     "entities": [
       {
         "tableName": "BroadcastNostrEventReceipt",
@@ -1188,7 +1188,7 @@
       },
       {
         "tableName": "MarmotKeyPackageBundle",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `publicKey` TEXT NOT NULL, `tlsEncodedMarmotKeyPackage` TEXT NOT NULL, `ncryptsecInitPrivateKey` TEXT NOT NULL, `ncryptsecEncryptionPrivateKey` TEXT NOT NULL, `ncryptsecSignaturePrivateKey` TEXT NOT NULL, `createdAt` INTEGER NOT NULL, `updatedAt` INTEGER NOT NULL, `savedAt` INTEGER NOT NULL, `deletedAt` INTEGER, `broadcastedAt` INTEGER)",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `publicKey` TEXT NOT NULL, `tlsEncodedMarmotKeyPackage` TEXT NOT NULL, `ncryptsecInitPrivateKey` TEXT NOT NULL, `ncryptsecEncryptionPrivateKey` TEXT NOT NULL, `ncryptsecSignaturePrivateKey` TEXT NOT NULL, `consumed` INTEGER NOT NULL, `rotated` INTEGER NOT NULL, `createdAt` INTEGER NOT NULL, `updatedAt` INTEGER NOT NULL, `savedAt` INTEGER NOT NULL, `deletedAt` INTEGER, `broadcastedAt` INTEGER)",
         "fields": [
           {
             "fieldPath": "id",
@@ -1226,6 +1226,18 @@
             "affinity": "TEXT",
             "notNull": true
           },
+          {
+            "fieldPath": "consumed",
+            "columnName": "consumed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "rotated",
+            "columnName": "rotated",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
           {
             "fieldPath": "createdAt",
             "columnName": "createdAt",
@@ -3032,7 +3044,7 @@
     ],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '6b621966e86b542862bb89991b2b3acb')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f33937ebefe679fe03b71b3930472139')"
     ]
   }
 }
\ No newline at end of file
diff --git a/composeApp/src/commonMain/kotlin/at/torch/compose/database/dao/MarmotKeyPackageBundleDao.kt b/composeApp/src/commonMain/kotlin/at/torch/compose/database/dao/MarmotKeyPackageBundleDao.kt
index 1366d98f..02f3bf65 100644
--- a/composeApp/src/commonMain/kotlin/at/torch/compose/database/dao/MarmotKeyPackageBundleDao.kt
+++ b/composeApp/src/commonMain/kotlin/at/torch/compose/database/dao/MarmotKeyPackageBundleDao.kt
@@ -7,7 +7,7 @@ import at.torch.compose.database.model.MarmotKeyPackageBundle
 
 @Dao
 interface MarmotKeyPackageBundleDao {
-    @Query("SELECT * FROM MarmotKeyPackageBundle WHERE keyPackageEventId = :keyPackageEventId ORDER BY createdAt DESC")
+    @Query("SELECT * FROM MarmotKeyPackageBundle WHERE id = :keyPackageEventId ORDER BY createdAt DESC")
     fun getMarmotKeyPackageBundleByKeyPackageEventIdId(keyPackageEventId: String): MarmotKeyPackageBundle?
 
     @Upsert