filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
SpiritCroc 2021-09-29 09:56:32 +02:00
parent d520e4f5c9
commit 0c7981dc26
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
attachment-viewer/build.gradle
View File

@ -37,7 +37,7 @@ android {
targetCompatibility versions.targetCompat targetCompatibility versions.targetCompat
} }
kotlinOptions { kotlinOptions {
jvmTarget = "11" jvmTarget = '1.8'
} }
buildFeatures { buildFeatures {
@ -59,4 +59,4 @@ dependencies {
implementation libs.androidx.recyclerview implementation libs.androidx.recyclerview
implementation libs.google.material implementation libs.google.material
} }

4
dependencies.gradle
View File

@ -3,8 +3,8 @@ ext.versions = [
'minSdk' : 21, 'minSdk' : 21,
'compileSdk' : 30, 'compileSdk' : 30,
'targetSdk' : 30, 'targetSdk' : 30,
'sourceCompat' : JavaVersion.VERSION_11, 'sourceCompat' : JavaVersion.VERSION_1_8,
'targetCompat' : JavaVersion.VERSION_11, 'targetCompat' : JavaVersion.VERSION_1_8,
] ]
def gradle = "7.0.2" def gradle = "7.0.2"

3
diff-match-patch/build.gradle
View File

@ -3,3 +3,6 @@ apply plugin: 'java-library'
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
} }
sourceCompatibility = "8"
targetCompatibility = "8"

7
library/ui-styles/build.gradle
View File

@ -36,16 +36,13 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
} }
compileOptions { compileOptions {
sourceCompatibility versions.sourceCompat sourceCompatibility versions.sourceCompat
targetCompatibility versions.targetCompat targetCompatibility versions.targetCompat
} }
kotlinOptions { kotlinOptions {
jvmTarget = "11" jvmTarget = '1.8'
} }
buildFeatures { buildFeatures {
viewBinding true viewBinding true
} }
@ -62,4 +59,4 @@ dependencies {
implementation 'im.dlg:android-dialer:1.2.5' implementation 'im.dlg:android-dialer:1.2.5'
// AudioRecordView attr // AudioRecordView attr
implementation 'com.github.Armen101:AudioRecordView:1.0.5' implementation 'com.github.Armen101:AudioRecordView:1.0.5'
} }

2
matrix-sdk-android-rx/build.gradle
View File

@ -27,7 +27,7 @@ android {
} }
kotlinOptions { kotlinOptions {
jvmTarget = "11" jvmTarget = "1.8"
} }
} }

2
matrix-sdk-android/build.gradle
View File

@ -71,7 +71,7 @@ android {
} }
kotlinOptions { kotlinOptions {
jvmTarget = "11" jvmTarget = "1.8"
} }
sourceSets { sourceSets {

2
vector/build.gradle
View File

@ -302,7 +302,7 @@ android {
} }
kotlinOptions { kotlinOptions {
jvmTarget = "11" jvmTarget = "1.8"
} }
sourceSets { sourceSets {