From 0c7981dc26a8ab60ea6fb6b6d9d4213b06fea9d0 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Wed, 29 Sep 2021 09:56:32 +0200
Subject: [PATCH] Revert "Revert "Revert "Use Java 11 source code"""
This reverts commit 23afa02cad957e4426cc7fc872910c6f0b556cb5.
Change-Id: I0dc76749a7084473a5c15e84032f0ba5058cac72
Conflicts:
attachment-viewer/build.gradle
library/ui-styles/build.gradle
matrix-sdk-android-rx/build.gradle
matrix-sdk-android/build.gradle
vector/build.gradle
---
attachment-viewer/build.gradle | 4 ++--
dependencies.gradle | 4 ++--
diff-match-patch/build.gradle | 3 +++
library/ui-styles/build.gradle | 7 ++-----
matrix-sdk-android-rx/build.gradle | 2 +-
matrix-sdk-android/build.gradle | 2 +-
vector/build.gradle | 2 +-
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle
index 064f497dc7..23ff9858aa 100644
--- a/attachment-viewer/build.gradle
+++ b/attachment-viewer/build.gradle
@@ -37,7 +37,7 @@ android {
targetCompatibility versions.targetCompat
}
kotlinOptions {
- jvmTarget = "11"
+ jvmTarget = '1.8'
}
buildFeatures {
@@ -59,4 +59,4 @@ dependencies {
implementation libs.androidx.recyclerview
implementation libs.google.material
-}
\ No newline at end of file
+}
diff --git a/dependencies.gradle b/dependencies.gradle
index 9ff90c7264..470b30a93b 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -3,8 +3,8 @@ ext.versions = [
'minSdk' : 21,
'compileSdk' : 30,
'targetSdk' : 30,
- 'sourceCompat' : JavaVersion.VERSION_11,
- 'targetCompat' : JavaVersion.VERSION_11,
+ 'sourceCompat' : JavaVersion.VERSION_1_8,
+ 'targetCompat' : JavaVersion.VERSION_1_8,
]
def gradle = "7.0.2"
diff --git a/diff-match-patch/build.gradle b/diff-match-patch/build.gradle
index f623c57a49..82292e24db 100644
--- a/diff-match-patch/build.gradle
+++ b/diff-match-patch/build.gradle
@@ -3,3 +3,6 @@ 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 cee58414c7..abab4e65ad 100644
--- a/library/ui-styles/build.gradle
+++ b/library/ui-styles/build.gradle
@@ -36,16 +36,13 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
-
compileOptions {
sourceCompatibility versions.sourceCompat
targetCompatibility versions.targetCompat
}
-
kotlinOptions {
- jvmTarget = "11"
+ jvmTarget = '1.8'
}
-
buildFeatures {
viewBinding true
}
@@ -62,4 +59,4 @@ dependencies {
implementation 'im.dlg:android-dialer:1.2.5'
// AudioRecordView attr
implementation 'com.github.Armen101:AudioRecordView:1.0.5'
-}
\ No newline at end of file
+}
diff --git a/matrix-sdk-android-rx/build.gradle b/matrix-sdk-android-rx/build.gradle
index dbd761cee3..437f304b0b 100644
--- a/matrix-sdk-android-rx/build.gradle
+++ b/matrix-sdk-android-rx/build.gradle
@@ -27,7 +27,7 @@ android {
}
kotlinOptions {
- jvmTarget = "11"
+ jvmTarget = "1.8"
}
}
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index f50a6c2e92..c927d8fb13 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -71,7 +71,7 @@ android {
}
kotlinOptions {
- jvmTarget = "11"
+ jvmTarget = "1.8"
}
sourceSets {
diff --git a/vector/build.gradle b/vector/build.gradle
index 7a795fea23..1e2efc456a 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -302,7 +302,7 @@ android {
}
kotlinOptions {
- jvmTarget = "11"
+ jvmTarget = "1.8"
}
sourceSets {