Clean up modules' dependencies

thunderbird · Jul 8, 2018 · f6713ea · f6713ea
1 parent f63b409
commit f6713ea
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 12 deletions.
diff --git a/app/core/build.gradle b/app/core/build.gradle
@@ -20,17 +20,16 @@ dependencies {
 
     api project(':plugins:openpgp-api-lib:openpgp-api')
 
-    api "com.squareup.okio:okio:${versions.okio}"
-    api "commons-io:commons-io:${versions.commonsIo}"
-    api "androidx.core:core-ktx:0.3"
-    api "org.jsoup:jsoup:1.11.2"
-    api "com.squareup.moshi:moshi:1.2.0"
-    api "com.jakewharton.timber:timber:${versions.timber}"
-    api "net.jcip:jcip-annotations:1.0"
-    api "org.apache.james:apache-mime4j-core:0.8.1"
-    api "org.jetbrains.anko:anko-coroutines:0.10.4"
     api "org.koin:koin-android-architecture:${versions.koin}"
 
+    implementation "com.squareup.okio:okio:${versions.okio}"
+    implementation "commons-io:commons-io:${versions.commonsIo}"
+    implementation "androidx.core:core-ktx:${versions.coreKtx}"
+    implementation "org.jsoup:jsoup:1.11.2"
+    implementation "com.squareup.moshi:moshi:1.2.0"
+    implementation "com.jakewharton.timber:timber:${versions.timber}"
+    implementation "org.apache.james:apache-mime4j-core:${versions.mime4j}"
+
     testImplementation project(':mail:testing')
     testImplementation "org.robolectric:robolectric:${versions.robolectric}"
     testImplementation "junit:junit:${versions.junit}"

diff --git a/app/k9mail/build.gradle b/app/k9mail/build.gradle
@@ -17,6 +17,8 @@ dependencies {
 
     implementation "com.android.support:appcompat-v7:${versions.supportLibrary}"
 
+    implementation "com.jakewharton.timber:timber:${versions.timber}"
+
     testImplementation "org.robolectric:robolectric:${versions.robolectric}"
     testImplementation "junit:junit:${versions.junit}"
     testImplementation "com.google.truth:truth:${versions.truth}"

diff --git a/app/ui/build.gradle b/app/ui/build.gradle
@@ -30,6 +30,13 @@ dependencies {
     implementation "com.xwray:groupie-kotlin-android-extensions:2.1.0"
     implementation 'com.mikepenz:materialdrawer:6.0.7'
 
+    implementation "commons-io:commons-io:${versions.commonsIo}"
+    implementation "androidx.core:core-ktx:${versions.coreKtx}"
+    implementation "net.jcip:jcip-annotations:1.0"
+    implementation "com.jakewharton.timber:timber:${versions.timber}"
+    implementation "org.apache.james:apache-mime4j-core:${versions.mime4j}"
+    implementation "org.jetbrains.anko:anko-coroutines:0.10.4"
+
     testImplementation project(':mail:testing')
     testImplementation "org.robolectric:robolectric:${versions.robolectric}"
     testImplementation "junit:junit:${versions.junit}"

diff --git a/build.gradle b/build.gradle
@@ -15,6 +15,8 @@ buildscript {
                 'timber': '4.5.1',
                 'koin': '0.9.1',
                 'commonsIo': '2.4',
+                'coreKtx': '0.3',
+                'mime4j': '0.8.1',
 
                 'junit': '4.12',
                 'robolectric': '3.7.1',

diff --git a/mail/common/build.gradle b/mail/common/build.gradle
@@ -11,8 +11,8 @@ if (rootProject.testCoverage) {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
 
-    implementation "org.apache.james:apache-mime4j-core:0.8.1"
-    implementation "org.apache.james:apache-mime4j-dom:0.8.1"
+    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}"
     implementation "commons-io:commons-io:${versions.commonsIo}"
     implementation "com.android.support:support-annotations:${versions.supportLibrary}"

diff --git a/mail/protocols/imap/build.gradle b/mail/protocols/imap/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     testImplementation "com.google.truth:truth:${versions.truth}"
     testImplementation "org.mockito:mockito-core:${versions.mockito}"
     testImplementation "com.squareup.okio:okio:${versions.okio}"
-    testImplementation "org.apache.james:apache-mime4j-core:0.8.1"
+    testImplementation "org.apache.james:apache-mime4j-core:${versions.mime4j}"
 }
 
 android {