From 8851f5aac8dbfcfec678ae676c2635ef5387f54f Mon Sep 17 00:00:00 2001
From: Reid Baker <reidbaker@google.com>
Date: Thu, 2 Oct 2025 11:32:24 -0400
Subject: [PATCH 1/2] migrate espresso from java 11 to java 17

---
 packages/espresso/android/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/espresso/android/build.gradle b/packages/espresso/android/build.gradle
index 89a954199bb..6037658905d 100644
--- a/packages/espresso/android/build.gradle
+++ b/packages/espresso/android/build.gradle
@@ -31,8 +31,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     lintOptions {

From 786477cf66924af79fd7aedbf653cc22f6b63297 Mon Sep 17 00:00:00 2001
From: Reid Baker <reidbaker@google.com>
Date: Thu, 2 Oct 2025 11:35:26 -0400
Subject: [PATCH 2/2] Update version and changelog

---
 packages/espresso/CHANGELOG.md | 5 +++++
 packages/espresso/pubspec.yaml | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/espresso/CHANGELOG.md b/packages/espresso/CHANGELOG.md
index ca9437a8de2..a75112530e9 100644
--- a/packages/espresso/CHANGELOG.md
+++ b/packages/espresso/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.0+15
+
+* Updates Java compatibility version to 17.
+* Updates minimum supported SDK version to Flutter 3.35/Dart 3.9.
+
 ## 0.4.0+14
 
 * Bumps okhttp, junit, and truth dependencies.
diff --git a/packages/espresso/pubspec.yaml b/packages/espresso/pubspec.yaml
index 25032b50f14..83db82ef707 100644
--- a/packages/espresso/pubspec.yaml
+++ b/packages/espresso/pubspec.yaml
@@ -3,11 +3,11 @@ description: Java classes for testing Flutter apps using Espresso.
   Allows driving Flutter widgets from a native Espresso test.
 repository: https://github.com/flutter/packages/tree/main/packages/espresso
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+espresso%22
-version: 0.4.0+14
+version: 0.4.0+15
 
 environment:
-  sdk: ^3.7.0
-  flutter: ">=3.29.0"
+  sdk: ^3.9.0
+  flutter: ">=3.35.0"
 
 flutter:
   plugin: