diff --git a/build.gradle.kts b/build.gradle.kts
index d7b5834b..91b2840c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -133,6 +133,9 @@ subprojects {
             jvmTarget = "1.8"
             languageVersion = "1.6"
             apiVersion = "1.6"
+            if (JavaVersion.current().isJava9Compatible && project.name != "android") {
+                freeCompilerArgs += "-Xjdk-release=1.8"
+            }
         }
     }
     tasks.withType<JavaCompile> {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4a20e1d6..758debe6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -18,7 +18,7 @@ spotless = "6.22.0"
 android = { module = "com.google.android:android", version.ref = "android" }
 android-material = { module = "com.google.android.material:material", version = "1.10.0" }
 android-multidex = { module = "com.android.support:multidex", version = "1.0.3" }
-android-plugin = { module = "com.android.tools.build:gradle", version = "8.1.2" }
+android-plugin = { module = "com.android.tools.build:gradle", version = "8.1.3" }
 androidx-annotations = { module = "androidx.annotation:annotation", version = "1.7.0" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.6.1" }
 androidx-compose = { module = "androidx.activity:activity-compose", version = "1.8.0" }