From 610d818f25366ea2b69bd71377517726dffe469d Mon Sep 17 00:00:00 2001 From: cketti Date: Tue, 25 Apr 2023 19:30:14 +0200 Subject: [PATCH] Move all :app:autodiscovery:* modules to :feature:autodiscovery --- app/ui/legacy/build.gradle.kts | 4 ++-- {app => feature}/autodiscovery/api/build.gradle.kts | 0 .../k9/autodiscovery/api/ConnectionSettingsDiscovery.kt | 0 .../autodiscovery/providersxml/build.gradle.kts | 2 +- .../com/fsck/k9/autodiscovery/providersxml/KoinModule.kt | 0 .../autodiscovery/providersxml/ProvidersXmlDiscovery.kt | 0 .../k9/autodiscovery/providersxml/ProvidersXmlProvider.kt | 0 .../providersxml/src/main/res/xml/providers.xml | 0 .../providersxml/ProvidersXmlDiscoveryTest.kt | 0 .../autodiscovery/srvrecords/build.gradle.kts | 2 +- .../k9/autodiscovery/srvrecords/MiniDnsSrvResolver.kt | 0 .../com/fsck/k9/autodiscovery/srvrecords/SrvResolver.kt | 0 .../k9/autodiscovery/srvrecords/SrvServiceDiscovery.kt | 0 .../autodiscovery/srvrecords/SrvServiceDiscoveryTest.kt | 0 .../autodiscovery/thunderbird/build.gradle.kts | 2 +- .../thunderbird/ThunderbirdAutoconfigFetcher.kt | 0 .../thunderbird/ThunderbirdAutoconfigParser.kt | 0 .../thunderbird/ThunderbirdAutoconfigUrlProvider.kt | 0 .../k9/autodiscovery/thunderbird/ThunderbirdDiscovery.kt | 0 .../thunderbird/ThunderbirdAutoconfigFetcherTest.kt | 0 .../thunderbird/ThunderbirdAutoconfigTest.kt | 0 .../thunderbird/ThunderbirdAutoconfigUrlProviderTest.kt | 0 settings.gradle.kts | 8 ++++---- 23 files changed, 9 insertions(+), 9 deletions(-) rename {app => feature}/autodiscovery/api/build.gradle.kts (100%) rename {app => feature}/autodiscovery/api/src/main/java/com/fsck/k9/autodiscovery/api/ConnectionSettingsDiscovery.kt (100%) rename {app => feature}/autodiscovery/providersxml/build.gradle.kts (88%) rename {app => feature}/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/KoinModule.kt (100%) rename {app => feature}/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscovery.kt (100%) rename {app => feature}/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlProvider.kt (100%) rename {app => feature}/autodiscovery/providersxml/src/main/res/xml/providers.xml (100%) rename {app => feature}/autodiscovery/providersxml/src/test/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscoveryTest.kt (100%) rename {app => feature}/autodiscovery/srvrecords/build.gradle.kts (76%) rename {app => feature}/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/MiniDnsSrvResolver.kt (100%) rename {app => feature}/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/SrvResolver.kt (100%) rename {app => feature}/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscovery.kt (100%) rename {app => feature}/autodiscovery/srvrecords/src/test/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscoveryTest.kt (100%) rename {app => feature}/autodiscovery/thunderbird/build.gradle.kts (85%) rename {app => feature}/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcher.kt (100%) rename {app => feature}/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigParser.kt (100%) rename {app => feature}/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProvider.kt (100%) rename {app => feature}/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdDiscovery.kt (100%) rename {app => feature}/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcherTest.kt (100%) rename {app => feature}/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigTest.kt (100%) rename {app => feature}/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProviderTest.kt (100%) diff --git a/app/ui/legacy/build.gradle.kts b/app/ui/legacy/build.gradle.kts index c245aca3e4..856839488c 100644 --- a/app/ui/legacy/build.gradle.kts +++ b/app/ui/legacy/build.gradle.kts @@ -6,8 +6,8 @@ plugins { dependencies { api(projects.app.ui.base) implementation(projects.app.core) - implementation(projects.app.autodiscovery.api) - implementation(projects.app.autodiscovery.providersxml) + implementation(projects.feature.autodiscovery.api) + implementation(projects.feature.autodiscovery.providersxml) implementation(projects.mail.common) implementation(projects.uiUtils.toolbarBottomSheet) diff --git a/app/autodiscovery/api/build.gradle.kts b/feature/autodiscovery/api/build.gradle.kts similarity index 100% rename from app/autodiscovery/api/build.gradle.kts rename to feature/autodiscovery/api/build.gradle.kts diff --git a/app/autodiscovery/api/src/main/java/com/fsck/k9/autodiscovery/api/ConnectionSettingsDiscovery.kt b/feature/autodiscovery/api/src/main/java/com/fsck/k9/autodiscovery/api/ConnectionSettingsDiscovery.kt similarity index 100% rename from app/autodiscovery/api/src/main/java/com/fsck/k9/autodiscovery/api/ConnectionSettingsDiscovery.kt rename to feature/autodiscovery/api/src/main/java/com/fsck/k9/autodiscovery/api/ConnectionSettingsDiscovery.kt diff --git a/app/autodiscovery/providersxml/build.gradle.kts b/feature/autodiscovery/providersxml/build.gradle.kts similarity index 88% rename from app/autodiscovery/providersxml/build.gradle.kts rename to feature/autodiscovery/providersxml/build.gradle.kts index 567ae954e5..738777e423 100644 --- a/app/autodiscovery/providersxml/build.gradle.kts +++ b/feature/autodiscovery/providersxml/build.gradle.kts @@ -5,7 +5,7 @@ plugins { dependencies { implementation(projects.app.core) implementation(projects.mail.common) - implementation(projects.app.autodiscovery.api) + implementation(projects.feature.autodiscovery.api) implementation(libs.timber) diff --git a/app/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/KoinModule.kt b/feature/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/KoinModule.kt similarity index 100% rename from app/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/KoinModule.kt rename to feature/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/KoinModule.kt diff --git a/app/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscovery.kt b/feature/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscovery.kt similarity index 100% rename from app/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscovery.kt rename to feature/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscovery.kt diff --git a/app/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlProvider.kt b/feature/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlProvider.kt similarity index 100% rename from app/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlProvider.kt rename to feature/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlProvider.kt diff --git a/app/autodiscovery/providersxml/src/main/res/xml/providers.xml b/feature/autodiscovery/providersxml/src/main/res/xml/providers.xml similarity index 100% rename from app/autodiscovery/providersxml/src/main/res/xml/providers.xml rename to feature/autodiscovery/providersxml/src/main/res/xml/providers.xml diff --git a/app/autodiscovery/providersxml/src/test/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscoveryTest.kt b/feature/autodiscovery/providersxml/src/test/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscoveryTest.kt similarity index 100% rename from app/autodiscovery/providersxml/src/test/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscoveryTest.kt rename to feature/autodiscovery/providersxml/src/test/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscoveryTest.kt diff --git a/app/autodiscovery/srvrecords/build.gradle.kts b/feature/autodiscovery/srvrecords/build.gradle.kts similarity index 76% rename from app/autodiscovery/srvrecords/build.gradle.kts rename to feature/autodiscovery/srvrecords/build.gradle.kts index 386e65202a..22ad102926 100644 --- a/app/autodiscovery/srvrecords/build.gradle.kts +++ b/feature/autodiscovery/srvrecords/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } dependencies { - api(projects.app.autodiscovery.api) + api(projects.feature.autodiscovery.api) implementation(libs.minidns.hla) } diff --git a/app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/MiniDnsSrvResolver.kt b/feature/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/MiniDnsSrvResolver.kt similarity index 100% rename from app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/MiniDnsSrvResolver.kt rename to feature/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/MiniDnsSrvResolver.kt diff --git a/app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/SrvResolver.kt b/feature/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/SrvResolver.kt similarity index 100% rename from app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/SrvResolver.kt rename to feature/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/SrvResolver.kt diff --git a/app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscovery.kt b/feature/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscovery.kt similarity index 100% rename from app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscovery.kt rename to feature/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscovery.kt diff --git a/app/autodiscovery/srvrecords/src/test/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscoveryTest.kt b/feature/autodiscovery/srvrecords/src/test/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscoveryTest.kt similarity index 100% rename from app/autodiscovery/srvrecords/src/test/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscoveryTest.kt rename to feature/autodiscovery/srvrecords/src/test/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscoveryTest.kt diff --git a/app/autodiscovery/thunderbird/build.gradle.kts b/feature/autodiscovery/thunderbird/build.gradle.kts similarity index 85% rename from app/autodiscovery/thunderbird/build.gradle.kts rename to feature/autodiscovery/thunderbird/build.gradle.kts index 610859b514..cebc3c662d 100644 --- a/app/autodiscovery/thunderbird/build.gradle.kts +++ b/feature/autodiscovery/thunderbird/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } dependencies { - api(projects.app.autodiscovery.api) + api(projects.feature.autodiscovery.api) compileOnly(libs.xmlpull) implementation(libs.okhttp) diff --git a/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcher.kt b/feature/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcher.kt similarity index 100% rename from app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcher.kt rename to feature/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcher.kt diff --git a/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigParser.kt b/feature/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigParser.kt similarity index 100% rename from app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigParser.kt rename to feature/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigParser.kt diff --git a/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProvider.kt b/feature/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProvider.kt similarity index 100% rename from app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProvider.kt rename to feature/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProvider.kt diff --git a/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdDiscovery.kt b/feature/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdDiscovery.kt similarity index 100% rename from app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdDiscovery.kt rename to feature/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdDiscovery.kt diff --git a/app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcherTest.kt b/feature/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcherTest.kt similarity index 100% rename from app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcherTest.kt rename to feature/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcherTest.kt diff --git a/app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigTest.kt b/feature/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigTest.kt similarity index 100% rename from app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigTest.kt rename to feature/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigTest.kt diff --git a/app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProviderTest.kt b/feature/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProviderTest.kt similarity index 100% rename from app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProviderTest.kt rename to feature/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProviderTest.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index f8c7083fe4..c16104f875 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -35,15 +35,15 @@ include( ":app:storage", ":app:crypto-openpgp", ":app:testing", - ":app:autodiscovery:api", - ":app:autodiscovery:providersxml", - ":app:autodiscovery:srvrecords", - ":app:autodiscovery:thunderbird", ":app:html-cleaner", ) include( ":feature:onboarding", + ":feature:autodiscovery:api", + ":feature:autodiscovery:providersxml", + ":feature:autodiscovery:srvrecords", + ":feature:autodiscovery:thunderbird", ) include(