From 133a9c2810443c7ba624a674dcdc3c380f7d7b56 Mon Sep 17 00:00:00 2001
From: mcarare <48995920+mcarare@users.noreply.github.com>
Date: Mon, 22 May 2023 15:18:26 +0300
Subject: [PATCH] Bug 1831352 - Target Java 17.

---
 app/build.gradle                | 4 ++--
 benchmark/build.gradle          | 6 +++---
 build.gradle                    | 2 +-
 mozilla-lint-rules/build.gradle | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fe39a12064..81d60db1fc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -213,8 +213,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     lint {
diff --git a/benchmark/build.gradle b/benchmark/build.gradle
index dc8bb9a6e9..8feec5f2b8 100644
--- a/benchmark/build.gradle
+++ b/benchmark/build.gradle
@@ -12,12 +12,12 @@ android {
     compileSdk Config.compileSdkVersion
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 
     defaultConfig {
diff --git a/build.gradle b/build.gradle
index aadb187c1b..55dd98893d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -163,7 +163,7 @@ allprojects {
     }
 
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
-        kotlinOptions.jvmTarget = "11"
+        kotlinOptions.jvmTarget = "17"
         kotlinOptions.allWarningsAsErrors = true
         kotlinOptions.freeCompilerArgs += [
             "-opt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"
diff --git a/mozilla-lint-rules/build.gradle b/mozilla-lint-rules/build.gradle
index 888a8f1928..80f99ab24f 100644
--- a/mozilla-lint-rules/build.gradle
+++ b/mozilla-lint-rules/build.gradle
@@ -5,8 +5,8 @@
 apply plugin: 'java-library'
 apply plugin: 'kotlin'
 
-targetCompatibility = JavaVersion.VERSION_11
-sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_17
 
 repositories {
     if (project.hasProperty("centralRepo")) {