From 97464969ea49ba8c78a15664af1f86cefb35b5cb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Tue, 19 Oct 2021 19:04:32 +0200
Subject: [PATCH 1/2] Small formatting
---
dependencies.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dependencies.gradle b/dependencies.gradle
index be6ce3f04f..a487b36c93 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -126,11 +126,11 @@ ext.libs = [
'jjwtImpl' : "io.jsonwebtoken:jjwt-impl:$jjwt",
'jjwtOrgjson' : "io.jsonwebtoken:jjwt-orgjson:$jjwt"
],
- vanniktech: [
+ vanniktech : [
'emojiMaterial' : "com.vanniktech:emoji-material:$vanniktechEmoji",
'emojiGoogle' : "com.vanniktech:emoji-google:$vanniktechEmoji"
],
- apache:[
+ apache : [
'commonsImaging' : "org.apache.sanselan:sanselan:0.97-incubator"
],
tests : [
From 85983562fa968387fe1db30c4f51ee59b30b4ee0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 19 Oct 2021 19:06:27 +0200
Subject: [PATCH 2/2] No need to add explicit dependencies on stdlib, this is
added by the gradle plugin since 1.4
https://kotlinlang.org/docs/whatsnew14.html#dependency-on-the-standard-library-added-by-default
---
attachment-viewer/build.gradle | 1 -
dependencies.gradle | 2 --
matrix-sdk-android-flow/build.gradle | 1 -
matrix-sdk-android/build.gradle | 2 --
multipicker/build.gradle | 1 -
vector/build.gradle | 1 -
6 files changed, 8 deletions(-)
diff --git a/attachment-viewer/build.gradle b/attachment-viewer/build.gradle
index 064f497dc7..02fbfc794c 100644
--- a/attachment-viewer/build.gradle
+++ b/attachment-viewer/build.gradle
@@ -53,7 +53,6 @@ dependencies {
implementation libs.rx.rxKotlin
implementation libs.rx.rxAndroid
- implementation libs.jetbrains.kotlinStdlib
implementation libs.androidx.core
implementation libs.androidx.appCompat
implementation libs.androidx.recyclerview
diff --git a/dependencies.gradle b/dependencies.gradle
index a487b36c93..7fa42a666f 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -37,8 +37,6 @@ ext.libs = [
'kotlinPlugin' : "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin"
],
jetbrains : [
- 'kotlinStdlibJdk7' : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin",
- 'kotlinStdlib' : "org.jetbrains.kotlin:kotlin-stdlib:$kotlin",
'coroutinesCore' : "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutines",
'coroutinesAndroid' : "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutines",
'coroutinesRx2' : "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$kotlinCoroutines"
diff --git a/matrix-sdk-android-flow/build.gradle b/matrix-sdk-android-flow/build.gradle
index fd2e2e0824..ea43ce20c8 100644
--- a/matrix-sdk-android-flow/build.gradle
+++ b/matrix-sdk-android-flow/build.gradle
@@ -35,7 +35,6 @@ dependencies {
implementation project(":matrix-sdk-android")
implementation libs.androidx.appCompat
- implementation libs.jetbrains.kotlinStdlibJdk7
implementation libs.jetbrains.coroutinesCore
implementation libs.jetbrains.coroutinesAndroid
implementation libs.androidx.lifecycleLivedata
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 43ca243ec5..b547ae037a 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -100,8 +100,6 @@ static def gitRevisionDate() {
}
dependencies {
-
- implementation libs.jetbrains.kotlinStdlibJdk7
implementation libs.jetbrains.coroutinesCore
implementation libs.jetbrains.coroutinesAndroid
diff --git a/multipicker/build.gradle b/multipicker/build.gradle
index 437499df7b..bb98a2f852 100644
--- a/multipicker/build.gradle
+++ b/multipicker/build.gradle
@@ -38,7 +38,6 @@ android {
}
dependencies {
- implementation libs.jetbrains.kotlinStdlibJdk7
implementation libs.androidx.appCompat
implementation libs.androidx.fragmentKtx
implementation libs.androidx.exifinterface
diff --git a/vector/build.gradle b/vector/build.gradle
index d06779d61c..31a4f1639c 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -340,7 +340,6 @@ dependencies {
implementation project(":library:ui-styles")
implementation 'androidx.multidex:multidex:2.0.1'
- implementation libs.jetbrains.kotlinStdlibJdk7
implementation libs.jetbrains.coroutinesCore
implementation libs.jetbrains.coroutinesAndroid