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

Commit 8b21092c authored by cketti's avatar cketti
Browse files

Convert :backend:* to JVM modules

parent 443807f3

app/core/src/main/java/com/fsck/k9/controller/MessagingController.java

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import com.fsck.k9.K9; 
import com.fsck.k9.Preferences;

import com.fsck.k9.backend.BackendManager;

import com.fsck.k9.backend.api.Backend;

import com.fsck.k9.backend.api.BuildConfig;

import com.fsck.k9.backend.api.SyncConfig;

import com.fsck.k9.backend.api.SyncListener;

import com.fsck.k9.controller.ControllerExtension.ControllerInternals;
@@ -51,6 +50,7 @@ import com.fsck.k9.controller.MessagingControllerCommands.PendingMoveOrCopy; 
import com.fsck.k9.controller.MessagingControllerCommands.PendingReplace;

import com.fsck.k9.controller.MessagingControllerCommands.PendingSetFlag;

import com.fsck.k9.controller.ProgressBodyFactory.ProgressListener;

import com.fsck.k9.core.BuildConfig;

import com.fsck.k9.helper.MutableBoolean;

import com.fsck.k9.mail.AuthType;

import com.fsck.k9.mail.AuthenticationFailedException;

backend/api/build.gradle

+8 −25
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'

apply plugin: 'com.android.lint'



dependencies {

    api project(":mail:common")

}



android {

    compileSdkVersion buildConfig.compileSdk

    buildToolsVersion buildConfig.buildTools



    defaultConfig {

        minSdkVersion buildConfig.minSdk

    }



    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")

}

backend/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.backend.api" />

backend/demo/build.gradle

+6 −34
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'

apply plugin: 'kotlin-kapt'

apply plugin: 'com.android.lint'



if (rootProject.testCoverage) {

    apply plugin: 'jacoco'

java {

    sourceCompatibility = javaVersion

    targetCompatibility = javaVersion

}



dependencies {

    api project(":backend:api")



    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.kotlinCoroutines}"

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

    implementation "com.squareup.moshi:moshi:${versions.moshi}"

    kapt "com.squareup.moshi:moshi-kotlin-codegen:${versions.moshi}"
@@ -19,32 +20,3 @@ dependencies { 
    testImplementation "org.mockito:mockito-core:${versions.mockito}"

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

}
 


android {

    compileSdkVersion buildConfig.compileSdk

    buildToolsVersion buildConfig.buildTools



    defaultConfig {

        minSdkVersion buildConfig.minSdk

    }



    buildTypes {

        debug {

            testCoverageEnabled rootProject.testCoverage

        }

    }



    lintOptions {

        abortOnError false

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

    }



    compileOptions {

        sourceCompatibility javaVersion

        targetCompatibility javaVersion

    }



    kotlinOptions {

        jvmTarget = kotlinJvmVersion

    }

}

backend/demo/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="app.k9mail.backend.demo" />