Merge pull request #8000 from thunderbird/add-app-common

Add `app-common` module
thunderbird · Jul 2, 2024 · 5988a40 · 5988a40
2 parents 43ab5dd + 87be1ad
commit 5988a40
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 13 deletions.
diff --git a/app-common/AndroidManifest.xml b/app-common/AndroidManifest.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:installLocation="auto"
+    >
+
+    <application
+        android:allowBackup="false"
+        android:hasFragileUserData="false"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:usesCleartextTraffic="true"
+        />
+
+</manifest>
diff --git a/app-common/README.md b/app-common/README.md
@@ -0,0 +1,7 @@
+# App Common
+
+# App Common
+
+This is the central integration point for shared code among the K-9 Mail and Thunderbird for Android applications. Its purpose is to collect and organize the individual feature modules that contain the actual functionality, as well as the "glue code" and configurations that tie them together.
+
+By keeping the shared code focused on these boundaries, we can ensure that it remains lean and avoids unnecessary dependencies. This approach allows us to maintain a clean and modular architecture, making it easier to maintain and update the codebase.
diff --git a/app-common/build.gradle.kts b/app-common/build.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+    id(ThunderbirdPlugins.Library.android)
+}
+
+dependencies {
+    api(projects.app.common)
+}
+
+android {
+    namespace = "app.k9mail.common"
+}
diff --git a/.../main/res/xml/network_security_config.xml → .../main/res/xml/network_security_config.xml b/.../main/res/xml/network_security_config.xml → .../main/res/xml/network_security_config.xml
diff --git a/app-k9mail/badging/release-badging.txt b/app-k9mail/badging/release-badging.txt
@@ -1,7 +1,7 @@
-package: name='com.fsck.k9' versionCode='39000' versionName='6.900-SNAPSHOT' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
+package: name='com.fsck.k9' versionCode='39004' versionName='6.905-SNAPSHOT' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
 install-location:'auto'
 sdkVersion:'21'
-targetSdkVersion:'33'
+targetSdkVersion:'34'
 uses-permission: name='android.permission.READ_CONTACTS'
 uses-permission: name='android.permission.POST_NOTIFICATIONS'
 uses-permission: name='android.permission.RECEIVE_BOOT_COMPLETED'
@@ -22,6 +22,7 @@ application-label-be:'Пошта K-9'
 application-label-bg:'K-9 Mail'
 application-label-br:'K-9 Mail'
 application-label-ca:'K-9 Mail'
+application-label-co:'K-9 Mail'
 application-label-cs:'K-9 Mail'
 application-label-cy:'K-9 Mail'
 application-label-da:'K-9 Mail'
@@ -33,7 +34,7 @@ application-label-eo:'K-9 Retpoŝtilo'
 application-label-es:'K-9 Mail'
 application-label-et:'K-9 Mail'
 application-label-eu:'K-9 Mail'
-application-label-fa:'کلاینت رایانامه K9'
+application-label-fa:'نامهٔ کِی۹'
 application-label-fi:'K-9 Mail'
 application-label-fr:'Courriel K-9 Mail'
 application-label-fy:'K-9 Mail'
@@ -46,6 +47,7 @@ application-label-is:'K-9 - Póstur'
 application-label-it:'K-9 Mail'
 application-label-iw:'דוא\"ל K-9'
 application-label-ja:'K-9 Mail'
+application-label-ko:'K-9 메일'
 application-label-lt:'K-9 paštas'
 application-label-lv:'K-9 pasts'
 application-label-ml:'K-9 Mail'
@@ -64,6 +66,7 @@ application-label-sr:'К-9 Пошта'
 application-label-sv:'K-9 Mail'
 application-label-tr:'K-9 Posta'
 application-label-uk:'K-9 Mail'
+application-label-vi:'Thư K-9'
 application-label-zh:'K-9 邮件'
 application-label-zh-CN:'K-9 邮件'
 application-label-zh-TW:'K-9 Mail'
@@ -88,5 +91,5 @@ other-receivers
 other-services
 supports-screens: 'small' 'normal' 'large' 'xlarge'
 supports-any-density: 'true'
-locales: '--_--' 'ar' 'be' 'bg' 'br' 'ca' 'cs' 'cy' 'da' 'de' 'el' 'en' 'en-GB' 'eo' 'es' 'et' 'eu' 'fa' 'fi' 'fr' 'fy' 'gd' 'gl' 'hr' 'hu' 'in' 'is' 'it' 'iw' 'ja' 'lt' 'lv' 'ml' 'nb' 'nl' 'pl' 'pt' 'pt-BR' 'pt-PT' 'ro' 'ru' 'sk' 'sl' 'sq' 'sr' 'sv' 'tr' 'uk' 'zh' 'zh-CN' 'zh-TW'
+locales: '--_--' 'ar' 'be' 'bg' 'br' 'ca' 'co' 'cs' 'cy' 'da' 'de' 'el' 'en' 'en-GB' 'eo' 'es' 'et' 'eu' 'fa' 'fi' 'fr' 'fy' 'gd' 'gl' 'hr' 'hu' 'in' 'is' 'it' 'iw' 'ja' 'ko' 'lt' 'lv' 'ml' 'nb' 'nl' 'pl' 'pt' 'pt-BR' 'pt-PT' 'ro' 'ru' 'sk' 'sl' 'sq' 'sr' 'sv' 'tr' 'uk' 'vi' 'zh' 'zh-CN' 'zh-TW'
 densities: '120' '160' '240' '320' '480' '640' '65534'
diff --git a/app-k9mail/build.gradle.kts b/app-k9mail/build.gradle.kts
@@ -10,7 +10,7 @@ if (testCoverageEnabled) {
 }
 
 dependencies {
-    implementation(projects.app.common)
+    implementation(projects.appCommon)
     implementation(projects.core.ui.compose.theme2.k9mail)
     implementation(projects.core.ui.legacy.theme2.k9mail)
     implementation(projects.feature.launcher)

diff --git a/app-thunderbird/badging/release-badging.txt b/app-thunderbird/badging/release-badging.txt
@@ -1,7 +1,7 @@
 package: name='net.thunderbird.placeholder' versionCode='1' versionName='0.1-SNAPSHOT' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
 install-location:'auto'
 sdkVersion:'21'
-targetSdkVersion:'33'
+targetSdkVersion:'34'
 uses-permission: name='android.permission.READ_CONTACTS'
 uses-permission: name='android.permission.POST_NOTIFICATIONS'
 uses-permission: name='android.permission.RECEIVE_BOOT_COMPLETED'
@@ -22,6 +22,7 @@ application-label-be:'Thunderbird'
 application-label-bg:'Thunderbird'
 application-label-br:'Thunderbird'
 application-label-ca:'Thunderbird'
+application-label-co:'Thunderbird'
 application-label-cs:'Thunderbird'
 application-label-cy:'Thunderbird'
 application-label-da:'Thunderbird'
@@ -46,6 +47,7 @@ application-label-is:'Thunderbird'
 application-label-it:'Thunderbird'
 application-label-iw:'Thunderbird'
 application-label-ja:'Thunderbird'
+application-label-ko:'Thunderbird'
 application-label-lt:'Thunderbird'
 application-label-lv:'Thunderbird'
 application-label-ml:'Thunderbird'
@@ -64,6 +66,7 @@ application-label-sr:'Thunderbird'
 application-label-sv:'Thunderbird'
 application-label-tr:'Thunderbird'
 application-label-uk:'Thunderbird'
+application-label-vi:'Thunderbird'
 application-label-zh:'Thunderbird'
 application-label-zh-CN:'Thunderbird'
 application-label-zh-TW:'Thunderbird'
@@ -88,5 +91,5 @@ other-receivers
 other-services
 supports-screens: 'small' 'normal' 'large' 'xlarge'
 supports-any-density: 'true'
-locales: '--_--' 'ar' 'be' 'bg' 'br' 'ca' 'cs' 'cy' 'da' 'de' 'el' 'en' 'en-GB' 'eo' 'es' 'et' 'eu' 'fa' 'fi' 'fr' 'fy' 'gd' 'gl' 'hr' 'hu' 'in' 'is' 'it' 'iw' 'ja' 'lt' 'lv' 'ml' 'nb' 'nl' 'pl' 'pt' 'pt-BR' 'pt-PT' 'ro' 'ru' 'sk' 'sl' 'sq' 'sr' 'sv' 'tr' 'uk' 'zh' 'zh-CN' 'zh-TW'
+locales: '--_--' 'ar' 'be' 'bg' 'br' 'ca' 'co' 'cs' 'cy' 'da' 'de' 'el' 'en' 'en-GB' 'eo' 'es' 'et' 'eu' 'fa' 'fi' 'fr' 'fy' 'gd' 'gl' 'hr' 'hu' 'in' 'is' 'it' 'iw' 'ja' 'ko' 'lt' 'lv' 'ml' 'nb' 'nl' 'pl' 'pt' 'pt-BR' 'pt-PT' 'ro' 'ru' 'sk' 'sl' 'sq' 'sr' 'sv' 'tr' 'uk' 'vi' 'zh' 'zh-CN' 'zh-TW'
 densities: '120' '160' '240' '320' '480' '640' '65534'
diff --git a/app-thunderbird/build.gradle.kts b/app-thunderbird/build.gradle.kts
@@ -10,7 +10,7 @@ if (testCoverageEnabled) {
 }
 
 dependencies {
-    implementation(projects.app.common)
+    implementation(projects.appCommon)
     implementation(projects.core.ui.compose.theme2.thunderbird)
     implementation(projects.core.ui.legacy.theme2.thunderbird)
     implementation(projects.feature.launcher)

diff --git a/app/common/src/main/AndroidManifest.xml b/app/common/src/main/AndroidManifest.xml
@@ -2,7 +2,6 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:installLocation="auto"
     >
 
     <uses-feature
@@ -32,13 +31,9 @@
 
     <application
         android:allowTaskReparenting="false"
-        android:usesCleartextTraffic="true"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:theme="@style/Theme.K9.Startup"
         android:resizeableActivity="true"
-        android:allowBackup="false"
         android:supportsRtl="true"
-        android:hasFragileUserData="false"
         tools:replace="android:theme"
         tools:ignore="UnusedAttribute"
         >

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -26,6 +26,10 @@ include(
     ":app-ui-catalog",
 )
 
+include(
+    ":app-common",
+)
+
 include(
     ":app:common",
     ":app:ui:base",