From 80f23f1f3c798dd650dffb3f24b2d957a16e4743 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 2 Sep 2021 09:50:34 +0200
Subject: [PATCH] Use Java 11 source code

https://developer.android.com/studio/releases/gradle-plugin#java-11
---
 attachment-viewer/build.gradle     | 6 +++---
 diff-match-patch/build.gradle      | 3 ---
 library/ui-styles/build.gradle     | 9 ++++++---
 matrix-sdk-android-rx/build.gradle | 6 +++---
 matrix-sdk-android/build.gradle    | 6 +++---
 vector/build.gradle                | 6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle
index c393c5f483..d62062ae14 100644
--- a/attachment-viewer/build.gradle
+++ b/attachment-viewer/build.gradle
@@ -34,11 +34,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     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 e264ef8319..365e4b902c 100644
--- a/library/ui-styles/build.gradle
+++ b/library/ui-styles/build.gradle
@@ -39,13 +39,16 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
+
     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 93d2c42b9b..d18e3b1d72 100644
--- a/matrix-sdk-android-rx/build.gradle
+++ b/matrix-sdk-android-rx/build.gradle
@@ -24,12 +24,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 }
 
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 199c82f290..356240f5ec 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -72,12 +72,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 
     sourceSets {
diff --git a/vector/build.gradle b/vector/build.gradle
index 63860458b2..b153b67b12 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -288,12 +288,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 
     sourceSets {