From beb2b1e8a0a74ff4527ae9d573c4d2e431c7478c Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sat, 29 Jan 2022 10:35:52 +0100
Subject: [PATCH] [merge] Use Java 11 again

Change-Id: I3cc03216236097f4ba7b9de320fc927a603885a3
---
 attachment-viewer/build.gradle     | 2 +-
 diff-match-patch/build.gradle      | 3 ---
 library/ui-styles/build.gradle     | 2 +-
 matrix-sdk-android-rx/build.gradle | 2 +-
 matrix-sdk-android/build.gradle    | 2 +-
 vector/build.gradle                | 2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle
index e9ddefb62c..7705f72b58 100644
--- a/attachment-viewer/build.gradle
+++ b/attachment-viewer/build.gradle
@@ -37,7 +37,7 @@ android {
         targetCompatibility versions.targetCompat
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
 
     buildFeatures {
diff --git a/diff-match-patch/build.gradle b/diff-match-patch/build.gradle
index 82292e24db..f623c57a49 100644
--- a/diff-match-patch/build.gradle
+++ b/diff-match-patch/build.gradle
@@ -3,6 +3,3 @@ apply plugin: 'java-library'
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 }
-
-sourceCompatibility = "8"
-targetCompatibility = "8"
diff --git a/library/ui-styles/build.gradle b/library/ui-styles/build.gradle
index abab4e65ad..91b479c49a 100644
--- a/library/ui-styles/build.gradle
+++ b/library/ui-styles/build.gradle
@@ -41,7 +41,7 @@ android {
         targetCompatibility versions.targetCompat
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
     buildFeatures {
         viewBinding true
diff --git a/matrix-sdk-android-rx/build.gradle b/matrix-sdk-android-rx/build.gradle
index 437f304b0b..dbd761cee3 100644
--- a/matrix-sdk-android-rx/build.gradle
+++ b/matrix-sdk-android-rx/build.gradle
@@ -27,7 +27,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 }
 
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index f15746f73c..9674bdd372 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -72,7 +72,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 
     sourceSets {
diff --git a/vector/build.gradle b/vector/build.gradle
index 8b4075f77b..f185df9ae4 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -296,7 +296,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
         freeCompilerArgs += [
                 "-Xopt-in=kotlin.RequiresOptIn",
                 // Fixes false positive "This is an internal Mavericks API. It is not intended for external use."