From 5444d8be3a4e10b54d7b92617069f429d671f6ac Mon Sep 17 00:00:00 2001 From: cketti Date: Thu, 22 Apr 2021 02:39:04 +0200 Subject: [PATCH] Remove explicit dependency on Kotlin's standard library --- app/autodiscovery/api/build.gradle | 2 -- app/autodiscovery/providersxml/build.gradle | 2 -- app/autodiscovery/srvrecords/build.gradle | 2 -- app/autodiscovery/thunderbird/build.gradle | 2 -- app/core/build.gradle | 2 -- app/crypto-openpgp/build.gradle | 2 -- app/k9mail-jmap/build.gradle | 2 -- app/k9mail/build.gradle | 2 -- app/storage/build.gradle | 2 -- app/testing/build.gradle | 2 -- app/ui/base/build.gradle | 2 -- app/ui/legacy/build.gradle | 2 -- app/ui/setup/build.gradle | 2 -- backend/api/build.gradle | 2 -- backend/imap/build.gradle | 2 -- backend/jmap/build.gradle | 2 -- backend/pop3/build.gradle | 2 -- backend/webdav/build.gradle | 2 -- mail/common/build.gradle | 2 -- mail/protocols/imap/build.gradle | 2 -- mail/testing/build.gradle | 2 -- 21 files changed, 42 deletions(-) diff --git a/app/autodiscovery/api/build.gradle b/app/autodiscovery/api/build.gradle index 432f7be2a..7959cef84 100644 --- a/app/autodiscovery/api/build.gradle +++ b/app/autodiscovery/api/build.gradle @@ -2,8 +2,6 @@ apply plugin: 'com.android.library' apply plugin: 'org.jetbrains.kotlin.android' dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - implementation project(":app:core") } diff --git a/app/autodiscovery/providersxml/build.gradle b/app/autodiscovery/providersxml/build.gradle index 6b84be387..f427e7836 100644 --- a/app/autodiscovery/providersxml/build.gradle +++ b/app/autodiscovery/providersxml/build.gradle @@ -2,8 +2,6 @@ apply plugin: 'com.android.library' apply plugin: 'org.jetbrains.kotlin.android' dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - implementation project(":app:core") implementation project(":mail:common") implementation project(":app:autodiscovery:api") diff --git a/app/autodiscovery/srvrecords/build.gradle b/app/autodiscovery/srvrecords/build.gradle index 32f394de6..565bf3659 100644 --- a/app/autodiscovery/srvrecords/build.gradle +++ b/app/autodiscovery/srvrecords/build.gradle @@ -2,8 +2,6 @@ apply plugin: 'com.android.library' apply plugin: 'org.jetbrains.kotlin.android' dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - implementation project(":app:core") implementation project(":mail:common") implementation project(":app:autodiscovery:api") diff --git a/app/autodiscovery/thunderbird/build.gradle b/app/autodiscovery/thunderbird/build.gradle index f66ba3f72..afad77f1a 100644 --- a/app/autodiscovery/thunderbird/build.gradle +++ b/app/autodiscovery/thunderbird/build.gradle @@ -2,8 +2,6 @@ apply plugin: 'com.android.library' apply plugin: 'org.jetbrains.kotlin.android' dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - implementation project(":app:core") implementation project(":mail:common") implementation project(":app:autodiscovery:api") diff --git a/app/core/build.gradle b/app/core/build.gradle index 4f1611a9e..50526b3e1 100644 --- a/app/core/build.gradle +++ b/app/core/build.gradle @@ -3,8 +3,6 @@ apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'org.jetbrains.kotlin.plugin.parcelize' dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - api project(":mail:common") api project(":backend:api") diff --git a/app/crypto-openpgp/build.gradle b/app/crypto-openpgp/build.gradle index fc24fcfd7..1aa5537b5 100644 --- a/app/crypto-openpgp/build.gradle +++ b/app/crypto-openpgp/build.gradle @@ -2,8 +2,6 @@ apply plugin: 'com.android.library' apply plugin: 'org.jetbrains.kotlin.android' dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - implementation project(":app:core") testImplementation "junit:junit:${versions.junit}" diff --git a/app/k9mail-jmap/build.gradle b/app/k9mail-jmap/build.gradle index abc6b99f9..b6a3cf29f 100644 --- a/app/k9mail-jmap/build.gradle +++ b/app/k9mail-jmap/build.gradle @@ -7,8 +7,6 @@ if (rootProject.testCoverage) { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - implementation project(":app:ui:legacy") implementation project(":app:core") implementation project(":app:storage") diff --git a/app/k9mail/build.gradle b/app/k9mail/build.gradle index 5c8a0e3fc..ccdc8f797 100644 --- a/app/k9mail/build.gradle +++ b/app/k9mail/build.gradle @@ -6,8 +6,6 @@ if (rootProject.testCoverage) { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - implementation project(":app:ui:legacy") implementation project(":app:core") implementation project(":app:storage") diff --git a/app/storage/build.gradle b/app/storage/build.gradle index b788772ae..db0391a5a 100644 --- a/app/storage/build.gradle +++ b/app/storage/build.gradle @@ -2,8 +2,6 @@ apply plugin: 'com.android.library' apply plugin: 'org.jetbrains.kotlin.android' dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - api "org.koin:koin-core:${versions.koin}" implementation project(":app:core") diff --git a/app/testing/build.gradle b/app/testing/build.gradle index b79846fae..dcbf59e72 100644 --- a/app/testing/build.gradle +++ b/app/testing/build.gradle @@ -2,8 +2,6 @@ apply plugin: 'com.android.library' apply plugin: 'org.jetbrains.kotlin.android' dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - implementation project(':app:core') api "junit:junit:${versions.junit}" diff --git a/app/ui/base/build.gradle b/app/ui/base/build.gradle index 21a473b1e..63d9fac99 100644 --- a/app/ui/base/build.gradle +++ b/app/ui/base/build.gradle @@ -2,8 +2,6 @@ apply plugin: 'com.android.library' apply plugin: 'org.jetbrains.kotlin.android' dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - implementation project(":app:core") api "androidx.appcompat:appcompat:${versions.androidxAppCompat}" diff --git a/app/ui/legacy/build.gradle b/app/ui/legacy/build.gradle index c0f356d68..fbcc9ed00 100644 --- a/app/ui/legacy/build.gradle +++ b/app/ui/legacy/build.gradle @@ -3,8 +3,6 @@ apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'org.jetbrains.kotlin.plugin.parcelize' dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - api project(":app:ui:base") debugImplementation project(":app:ui:setup") implementation project(":app:core") diff --git a/app/ui/setup/build.gradle b/app/ui/setup/build.gradle index 0947c68ae..c81a991b2 100644 --- a/app/ui/setup/build.gradle +++ b/app/ui/setup/build.gradle @@ -2,8 +2,6 @@ apply plugin: 'com.android.library' apply plugin: 'org.jetbrains.kotlin.android' dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - api project(":app:ui:base") implementation project(":app:core") implementation project(":app:autodiscovery:api") diff --git a/backend/api/build.gradle b/backend/api/build.gradle index 463cb2b5d..639fc3331 100644 --- a/backend/api/build.gradle +++ b/backend/api/build.gradle @@ -3,8 +3,6 @@ apply plugin: 'org.jetbrains.kotlin.android' dependencies { api project(":mail:common") - - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" } android { diff --git a/backend/imap/build.gradle b/backend/imap/build.gradle index c860ca69c..d853a13e7 100644 --- a/backend/imap/build.gradle +++ b/backend/imap/build.gradle @@ -6,8 +6,6 @@ if (rootProject.testCoverage) { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - api project(":backend:api") api project(":mail:protocols:imap") api project(":mail:protocols:smtp") diff --git a/backend/jmap/build.gradle b/backend/jmap/build.gradle index 2e7ff38b2..dec182e56 100644 --- a/backend/jmap/build.gradle +++ b/backend/jmap/build.gradle @@ -7,8 +7,6 @@ if (rootProject.testCoverage) { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - api project(":backend:api") api "com.squareup.okhttp3:okhttp:${versions.okhttp}" diff --git a/backend/pop3/build.gradle b/backend/pop3/build.gradle index a26b29c9c..fb58ae2ac 100644 --- a/backend/pop3/build.gradle +++ b/backend/pop3/build.gradle @@ -6,8 +6,6 @@ if (rootProject.testCoverage) { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - api project(":backend:api") api project(":mail:protocols:pop3") api project(":mail:protocols:smtp") diff --git a/backend/webdav/build.gradle b/backend/webdav/build.gradle index 6359676cb..cca7b0a4c 100644 --- a/backend/webdav/build.gradle +++ b/backend/webdav/build.gradle @@ -6,8 +6,6 @@ if (rootProject.testCoverage) { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - api project(":backend:api") api project(":mail:protocols:webdav") diff --git a/mail/common/build.gradle b/mail/common/build.gradle index e22f5aea1..5711d6feb 100644 --- a/mail/common/build.gradle +++ b/mail/common/build.gradle @@ -6,8 +6,6 @@ if (rootProject.testCoverage) { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - implementation "org.apache.james:apache-mime4j-core:${versions.mime4j}" implementation "org.apache.james:apache-mime4j-dom:${versions.mime4j}" implementation "com.squareup.okio:okio:${versions.okio}" diff --git a/mail/protocols/imap/build.gradle b/mail/protocols/imap/build.gradle index 1cb0e31a3..54e9e80df 100644 --- a/mail/protocols/imap/build.gradle +++ b/mail/protocols/imap/build.gradle @@ -6,8 +6,6 @@ if (rootProject.testCoverage) { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - api project(":mail:common") implementation "com.jcraft:jzlib:1.0.7" diff --git a/mail/testing/build.gradle b/mail/testing/build.gradle index 9e772dae4..7f6ed262b 100644 --- a/mail/testing/build.gradle +++ b/mail/testing/build.gradle @@ -2,8 +2,6 @@ apply plugin: 'com.android.library' apply plugin: 'org.jetbrains.kotlin.android' dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - api project(":mail:common") api "com.squareup.okio:okio:${versions.okio}"