diff --git a/backstack/src/commonJvmTest/kotlin/com/slack/circuit/backstack/RememberSaveableBackstackTest.kt b/backstack/src/commonJvmTest/kotlin/com/slack/circuit/backstack/RememberSaveableBackstackTest.kt
index a32022573..0e0bfdcb3 100644
--- a/backstack/src/commonJvmTest/kotlin/com/slack/circuit/backstack/RememberSaveableBackstackTest.kt
+++ b/backstack/src/commonJvmTest/kotlin/com/slack/circuit/backstack/RememberSaveableBackstackTest.kt
@@ -30,7 +30,7 @@ class RememberSaveableBackstackTest {
     val rootScreen by mutableStateOf<Screen>(TestScreen.ScreenA)
     var dummyData by mutableStateOf(false)
     moleculeFlow(RecompositionMode.Immediate) {
-        dummyData
+        @Suppress("UNUSED_EXPRESSION") dummyData
         rememberSaveableBackStack(rootScreen)
       }
       .test {
diff --git a/gradle.properties b/gradle.properties
index f182864aa..8013da040 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@ org.gradle.jvmargs=-Xms1g -Xmx4g -Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=1g -
 android.useAndroidX=true
 
 # Force use of the latest android lint version
-android.experimental.lint.version=8.4.0-alpha09
+android.experimental.lint.version=8.5.0-alpha07
 
 # Helps make baseline profile generation more reliable
 # https://issuetracker.google.com/issues/287312019
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ae7e6fac3..c9b23fff3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ androidx-annotation = "1.7.1"
 androidx-appcompat = "1.6.1"
 androidx-browser = "1.8.0"
 androidx-lifecycle = "2.7.0"
-agp = "8.3.2"
+agp = "8.4.0"
 anvil = "2.4.9"
 atomicfu = "0.24.0"
 benchmark = "1.2.4"
diff --git a/samples/tutorial/build.gradle.kts b/samples/tutorial/build.gradle.kts
index 5ca30044e..d97c0e5c3 100644
--- a/samples/tutorial/build.gradle.kts
+++ b/samples/tutorial/build.gradle.kts
@@ -65,8 +65,12 @@ kotlin {
   }
 }
 
-tasks.withType<JavaCompile>().configureEach {
-  options.release.set(libs.versions.jvmTarget.map { it.toInt() })
-}
+tasks
+  .withType<JavaCompile>()
+  .named {
+    // Don't set the release flag on the android JavaCompile task
+    !it.endsWith("WithJavac")
+  }
+  .configureEach { options.release.set(libs.versions.jvmTarget.map(String::toInt)) }
 
 compose.desktop { application { mainClass = "com.slack.circuit.tutorial.MainKt" } }