From 8259b276610bbe20c9f9fe76b324351b1fed7e5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thi=C3=A9baud=20Weksteen?= <tweek@google.com>
Date: Mon, 25 Nov 2024 16:49:32 +1100
Subject: [PATCH] Mark kotlin target JVM as 1.8

There is a conflict between the compiler used for Java and Kotlin, even
if this is defined in the root project's build.gradle. Explicitly
note that the targeted jvm version is 1.8.

This was reported by Gradle and prevents the upgrade to Gradle 8.x.
---
 api-doclet/build.gradle | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/api-doclet/build.gradle b/api-doclet/build.gradle
index d83fffcd6..f97f49114 100644
--- a/api-doclet/build.gradle
+++ b/api-doclet/build.gradle
@@ -6,6 +6,9 @@ description = 'Conscrypt: API Doclet'
 
 kotlin {
     jvmToolchain(11)
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
+    }
 }
 
 dependencies {