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

Unverified Commit 1a27cfa4 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #6231 from thundernest/autodiscovery_jvm_modules 

Convert most of :app:autodiscovery to JVM projects
parents fd65e6e0 f4a47858

app/autodiscovery/api/build.gradle

+7 −26
Original line number Diff line number Diff line 
apply plugin: 'com.android.library'

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

apply plugin: 'java-library'

apply plugin: 'kotlin'



dependencies {

    implementation project(":app:core")

}



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

java {

    sourceCompatibility = javaVersion

    targetCompatibility = javaVersion

}



    kotlinOptions {

        jvmTarget = kotlinJvmVersion

    }

dependencies {

    api project(":mail:common")

}

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

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

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

app/autodiscovery/srvrecords/build.gradle

+8 −42
Original line number Diff line number Diff line 
apply plugin: 'com.android.library'

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

apply plugin: 'java-library'

apply plugin: 'kotlin'



java {

    sourceCompatibility = javaVersion

    targetCompatibility = javaVersion

}



dependencies {

    implementation project(":app:core")

    implementation project(":mail:common")

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

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



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

    implementation "org.minidns:minidns-hla:${versions.minidns}"



    testImplementation project(':app:testing')

    testImplementation project(":backend:imap")

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

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

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

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

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

    testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"

    testImplementation "io.insert-koin:koin-test:${versions.koin}"

    testImplementation "io.insert-koin:koin-test-junit4:${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/srvrecords/src/main/AndroidManifest.xml

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

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

app/autodiscovery/srvrecords/src/test/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscoveryTest.kt

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



import com.fsck.k9.RobolectricTest

import com.fsck.k9.autodiscovery.api.DiscoveredServerSettings

import com.fsck.k9.autodiscovery.api.DiscoveryResults

import com.fsck.k9.autodiscovery.api.DiscoveryTarget
@@ -12,7 +11,7 @@ import org.mockito.kotlin.mock 
import org.mockito.kotlin.verify

import org.mockito.kotlin.verifyNoMoreInteractions



class SrvServiceDiscoveryTest : RobolectricTest() {

class SrvServiceDiscoveryTest {



    @Test

    fun discover_whenNoMailServices_shouldReturnNoResults() {