diff --git a/android-application/build.gradle.kts b/android-application/build.gradle.kts
index 8fba81f..55f22a4 100644
--- a/android-application/build.gradle.kts
+++ b/android-application/build.gradle.kts
@@ -73,12 +73,12 @@ android {
         }
     }
     compileOptions {
-        targetCompatibility = JavaVersion.VERSION_1_8
-        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_11
         isCoreLibraryDesugaringEnabled = true
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_11.toString()
         freeCompilerArgs += listOf(
             "-P",
             "plugin:androidx.compose.compiler.plugins.kotlin:stabilityConfigurationPath=" +
diff --git a/android-extensions/build.gradle.kts b/android-extensions/build.gradle.kts
index fc429bf..1f4177a 100644
--- a/android-extensions/build.gradle.kts
+++ b/android-extensions/build.gradle.kts
@@ -17,14 +17,14 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_11.toString()
     }
     composeOptions {
         kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
     }
     compileOptions {
-        targetCompatibility = JavaVersion.VERSION_1_8
-        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_11
     }
 }
 
diff --git a/aprs-android/build.gradle.kts b/aprs-android/build.gradle.kts
index 73fd684..59e952e 100644
--- a/aprs-android/build.gradle.kts
+++ b/aprs-android/build.gradle.kts
@@ -44,11 +44,11 @@ android {
         }
     }
     compileOptions {
-        targetCompatibility = JavaVersion.VERSION_1_8
-        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_11.toString()
     }
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 477125a..dbc8b9c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,7 +24,7 @@ subprojects {
     afterEvaluate {
         tasks.withType<org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs> {
             kotlinOptions {
-                jvmTarget = JavaVersion.VERSION_1_8.toString()
+                jvmTarget = JavaVersion.VERSION_11.toString()
             }
         }
     }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 508686a..ae54c7e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ compose-compiler = "1.5.9"
 ack = "1.0.0"
 kimchi-core = "2.1.2"
 kimchi-firebase = "2.0.0"
-watermelon = "1.3.0"
+watermelon = "1.4.0"
 kotlin = "1.9.22"
 coroutines = "1.8.0"
 dagger = "2.46.1"
diff --git a/mapbox/build.gradle.kts b/mapbox/build.gradle.kts
index 51967de..5f3d969 100644
--- a/mapbox/build.gradle.kts
+++ b/mapbox/build.gradle.kts
@@ -16,14 +16,14 @@ android {
         buildConfig = true
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_11.toString()
     }
     composeOptions {
         kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
     }
     compileOptions {
-        targetCompatibility = JavaVersion.VERSION_1_8
-        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_11
     }
 }
 
diff --git a/maps/build.gradle.kts b/maps/build.gradle.kts
index fe36fc0..857c334 100644
--- a/maps/build.gradle.kts
+++ b/maps/build.gradle.kts
@@ -16,14 +16,14 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_11.toString()
     }
     composeOptions {
         kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
     }
     compileOptions {
-        targetCompatibility = JavaVersion.VERSION_1_8
-        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_11
     }
 }