wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up

Browse source
This commit is contained in:
cketti 2018-05-24 04:10:20 +02:00
parent fd7a21bec6
commit 47520d7ae1
9 changed files with 19 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mail/common/build.gradle
View file

@ -26,11 +26,6 @@ dependencies {
testImplementation "junit:junit:${versions.junit}"
testImplementation "com.google.truth:truth:${versions.truth}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
testImplementation "com.jcraft:jzlib:1.0.7"
// The Android Gradle plugin doesn't seem to put the Apache HTTP Client on the runtime classpath anymore when
// running JVM tests.
testImplementation "org.apache.httpcomponents:httpclient:4.5.5"
}
android {
@ -43,9 +38,6 @@ android {
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
// for using Apache HTTP Client
useLibrary 'org.apache.http.legacy'
buildTypes {
debug {
testCoverageEnabled rootProject.testCoverage

29
mail/k9mail/build.gradle
View file

@ -1,5 +1,4 @@
apply plugin: 'com.android.library'
apply plugin: 'org.jetbrains.kotlin.android'
apply from: "${rootProject.projectDir}/gradle/plugins/checkstyle-android.gradle"
apply from: "${rootProject.projectDir}/gradle/plugins/findbugs-android.gradle"
@ -9,30 +8,13 @@ if (rootProject.testCoverage) {
}
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
api project(":mail:common")
api project(":mail:protocols:imap")
api project(":mail:protocols:pop3")
api project(":mail:protocols:webdav")
api project(":mail:protocols:smtp")
implementation "org.apache.james:apache-mime4j-core:0.8.1"
implementation "org.apache.james:apache-mime4j-dom:0.8.1"
implementation "com.squareup.okio:okio:${versions.okio}"
implementation "commons-io:commons-io:${versions.commonsIo}"
implementation "com.jcraft:jzlib:1.0.7"
implementation "com.beetstra.jutf7:jutf7:1.0.0"
implementation "com.android.support:support-annotations:${versions.supportLibrary}"
implementation "com.jakewharton.timber:timber:${versions.timber}"
androidTestImplementation "com.android.support.test:runner:0.4.1"
androidTestImplementation "com.madgag.spongycastle:pg:1.51.0.0"
testImplementation "org.robolectric:robolectric:${versions.robolectric}"
testImplementation "junit:junit:${versions.junit}"
testImplementation "com.google.truth:truth:${versions.truth}"
testImplementation "org.mockito:mockito-core:${versions.mockito}"
}
android {
@ -41,8 +23,6 @@ android {
defaultConfig {
minSdkVersion buildConfig.minSdk
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
@ -60,13 +40,4 @@ android {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
packagingOptions {
exclude 'META-INF/DEPENDENCIES'
exclude 'META-INF/LICENSE'
exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/NOTICE'
exclude 'META-INF/NOTICE.txt'
exclude 'LICENSE.txt'
}
}

3
mail/protocols/imap/build.gradle
View file

@ -1,5 +1,4 @@
apply plugin: 'com.android.library'
apply plugin: 'org.jetbrains.kotlin.android'
apply from: "${rootProject.projectDir}/gradle/plugins/checkstyle-android.gradle"
apply from: "${rootProject.projectDir}/gradle/plugins/findbugs-android.gradle"
@ -9,8 +8,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"

19
mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/FolderNotFoundException.java Normal file
View file

@ -0,0 +1,19 @@
package com.fsck.k9.mail.store.imap;
import com.fsck.k9.mail.MessagingException;
public class FolderNotFoundException extends MessagingException {
private final String folderServerId;
public FolderNotFoundException(String folderServerId) {
super("Folder not found: " + folderServerId);
this.folderServerId = folderServerId;
}
public String getFolderServerId() {
return folderServerId;
}
}

6
mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/FolderNotFoundException.kt
View file

@ -1,6 +0,0 @@
package com.fsck.k9.mail.store.imap
import com.fsck.k9.mail.MessagingException
class FolderNotFoundException(val folderServerId: String)
: MessagingException("Folder not found: $folderServerId")

1
mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapFolder.java
View file

@ -35,7 +35,6 @@ import com.fsck.k9.mail.internet.MimeHeader;
import com.fsck.k9.mail.internet.MimeMessageHelper;
import com.fsck.k9.mail.internet.MimeMultipart;
import com.fsck.k9.mail.internet.MimeUtility;
import com.fsck.k9.mail.store.imap.FolderNotFoundException;
import timber.log.Timber;
import static com.fsck.k9.mail.store.imap.ImapUtility.getLastResponse;

3
mail/protocols/pop3/build.gradle
View file

@ -1,5 +1,4 @@
apply plugin: 'com.android.library'
apply plugin: 'org.jetbrains.kotlin.android'
apply from: "${rootProject.projectDir}/gradle/plugins/checkstyle-android.gradle"
apply from: "${rootProject.projectDir}/gradle/plugins/findbugs-android.gradle"
@ -9,8 +8,6 @@ if (rootProject.testCoverage) {
}
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
api project(":mail:common")
implementation "com.jakewharton.timber:timber:${versions.timber}"

3
mail/protocols/smtp/build.gradle
View file

@ -1,5 +1,4 @@
apply plugin: 'com.android.library'
apply plugin: 'org.jetbrains.kotlin.android'
apply from: "${rootProject.projectDir}/gradle/plugins/checkstyle-android.gradle"
apply from: "${rootProject.projectDir}/gradle/plugins/findbugs-android.gradle"
@ -9,8 +8,6 @@ if (rootProject.testCoverage) {
}
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
api project(":mail:common")
implementation "commons-io:commons-io:${versions.commonsIo}"

3
mail/protocols/webdav/build.gradle
View file

@ -1,5 +1,4 @@
apply plugin: 'com.android.library'
apply plugin: 'org.jetbrains.kotlin.android'
apply from: "${rootProject.projectDir}/gradle/plugins/checkstyle-android.gradle"
apply from: "${rootProject.projectDir}/gradle/plugins/findbugs-android.gradle"
@ -9,8 +8,6 @@ if (rootProject.testCoverage) {
}
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
api project(":mail:common")
implementation "commons-io:commons-io:${versions.commonsIo}"