From b1d43dd26fb07069644ed328e0b107c3d02c61e1 Mon Sep 17 00:00:00 2001
From: Christian De Angelis <christiandeange@gmail.com>
Date: Sat, 10 Feb 2024 03:03:02 -0500
Subject: [PATCH] Auto-provision JDK 11 if one isn't installed.

Fixes #4.
---
 build-logic/build.gradle.kts | 11 -----------
 settings.gradle.kts          |  4 ++++
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index 7364d10b..e6e81e36 100644
--- a/build-logic/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
   `java-gradle-plugin`
@@ -15,15 +13,6 @@ dependencies {
   compileOnly(kotlin("gradle-plugin"))
 }
 
-tasks.withType<JavaCompile>().configureEach { options.release.set(11) }
-tasks.withType<KotlinCompile>().configureEach { kotlinOptions.jvmTarget = "11" }
-
-kotlin {
-  jvmToolchain {
-    languageVersion.set(JavaLanguageVersion.of("11"))
-  }
-}
-
 gradlePlugin {
   plugins {
     create("ozone-android") {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2c2c6381..7613dcad 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -16,6 +16,10 @@ dependencyResolutionManagement {
   }
 }
 
+plugins {
+  id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = "ozone"
 
 // Sample app modules