From 8b71eaeea9087c5fc36fd43d4f38eac07e00eb9e Mon Sep 17 00:00:00 2001
From: Dominic Lemire <dominic.lemire@broadcom.com>
Date: Tue, 20 Jan 2026 12:47:33 -0800
Subject: [PATCH 1/2] Use jvmToolchain 21

Android Studio's built-in jbr is based on openjdk 21.0.8

Fix: android/tv-samples#192
---
 JetStreamCompose/benchmark/build.gradle.kts | 2 +-
 JetStreamCompose/jetstream/build.gradle.kts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/JetStreamCompose/benchmark/build.gradle.kts b/JetStreamCompose/benchmark/build.gradle.kts
index c032743d9..a049d0864 100644
--- a/JetStreamCompose/benchmark/build.gradle.kts
+++ b/JetStreamCompose/benchmark/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 android {
diff --git a/JetStreamCompose/jetstream/build.gradle.kts b/JetStreamCompose/jetstream/build.gradle.kts
index 9b1a54ca5..096b72bfd 100644
--- a/JetStreamCompose/jetstream/build.gradle.kts
+++ b/JetStreamCompose/jetstream/build.gradle.kts
@@ -24,7 +24,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 android {
@@ -67,7 +67,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "21"
     }
 }
 

From 53d5f42599be50fcbcf81d5dac1ea0caaf5bccd4 Mon Sep 17 00:00:00 2001
From: Dominic Lemire <dominic.lemire@broadcom.com>
Date: Tue, 20 Jan 2026 13:43:24 -0800
Subject: [PATCH 2/2] Use jvmToolchain 21 for JetStream (2)

Removed redundant jvmTarget

Fix: android/tv-samples#192
---
 JetStreamCompose/jetstream/build.gradle.kts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/JetStreamCompose/jetstream/build.gradle.kts b/JetStreamCompose/jetstream/build.gradle.kts
index 096b72bfd..1d078ae64 100644
--- a/JetStreamCompose/jetstream/build.gradle.kts
+++ b/JetStreamCompose/jetstream/build.gradle.kts
@@ -65,10 +65,6 @@ android {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
-
-    kotlinOptions {
-        jvmTarget = "21"
-    }
 }
 
 dependencies {