Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5f82fd0 authored by Olivia Mackintosh's avatar Olivia Mackintosh
Browse files

Split autodiscovery methods into gradle builds 

This commit should be faily self-explainatory. It splits the
three autodiscovery methods into their own gradle builds so
they can be plugged in and out easily. This commit doesn't
necessarily make the latter possible though.

Dependency graph should look something like this now:

  app:ui
  \
   \app:autodiscovery:api
    |
    |\app:autodiscovery:providersxml
    |
    |\app:autodiscovery:srvrecords
    |
     \app:autodiscovery:thunderbird
parent a6b3c69b

app/autodiscovery/src/main/AndroidManifest.xml→app/autodiscovery/api/src/main/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<manifest package="com.fsck.k9.autodiscovery" />
 
<manifest package="com.fsck.k9.autodiscovery.api" />

app/autodiscovery/src/main/java/com/fsck/k9/autodiscovery/ConnectionSettingsDiscovery.kt→app/autodiscovery/api/src/main/java/com/fsck/k9/autodiscovery/api/ConnectionSettingsDiscovery.kt

+1 −1
Original line number Diff line number Diff line 
package com.fsck.k9.autodiscovery

package com.fsck.k9.autodiscovery.api



import com.fsck.k9.mail.AuthType

import com.fsck.k9.mail.ConnectionSecurity

app/autodiscovery/providersxml/build.gradle

0 → 100644
+53 −0
Original line number Diff line number Diff line 
apply plugin: 'com.android.library'

apply plugin: 'org.jetbrains.kotlin.android'

apply plugin: 'org.jlleitschuh.gradle.ktlint'



dependencies {

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"



    implementation project(":app:core")

    implementation project(":mail:common")

    implementation project(":app:autodiscovery:api")



    implementation "com.jakewharton.timber:timber:${versions.timber}"



    testImplementation project(':app:testing')

    testImplementation project(":backend:imap")

    testImplementation "org.robolectric:robolectric:${versions.robolectric}"

    testImplementation "androidx.test:core:${versions.androidxCore}"

    testImplementation "junit:junit:${versions.junit}"

    testImplementation "com.google.truth:truth:${versions.truth}"

    testImplementation "org.mockito:mockito-core:${versions.mockito}"

    testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:${versions.mockitoKotlin}"

    testImplementation "org.koin:koin-test:${versions.koin}"

}



android {

    compileSdkVersion buildConfig.compileSdk

    buildToolsVersion buildConfig.buildTools



    defaultConfig {

        minSdkVersion buildConfig.minSdk

        targetSdkVersion buildConfig.robolectricSdk

    }



    lintOptions {

        abortOnError false

        lintConfig file("$rootProject.projectDir/config/lint/lint.xml")

    }



    compileOptions {

        sourceCompatibility javaVersion

        targetCompatibility javaVersion

    }



    kotlinOptions {

        jvmTarget = kotlinJvmVersion

    }



    testOptions {

        unitTests {

            includeAndroidResources = true

        }

    }

}

app/autodiscovery/providersxml/src/main/AndroidManifest.xml

0 → 100644
+2 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<manifest package="com.fsck.k9.autodiscovery.providersxml" />