From b48765181a12975c9742e7a14b8fb2dc911a64b6 Mon Sep 17 00:00:00 2001
From: Stephen King <sking@thunderbird.net>
Date: Tue, 18 Nov 2025 11:41:07 -0700
Subject: [PATCH] Update Thunderbird, K9mail to 14.0

---
 metadata/com.fsck.k9.yml             | 25 +++++++++++++++++++++++--
 metadata/net.thunderbird.android.yml | 25 +++++++++++++++++++++++--
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/metadata/com.fsck.k9.yml b/metadata/com.fsck.k9.yml
index 195c3a27c0..b982272338 100644
--- a/metadata/com.fsck.k9.yml
+++ b/metadata/com.fsck.k9.yml
@@ -1672,6 +1672,27 @@ Builds:
     scandelete:
       - build-plugin
 
+  - versionName: '14.0'
+    versionCode: 39030
+    commit: 84df9f77d5f4097c4d4ef6eeb9469214fbf4e36f
+    subdir: app-k9mail
+    sudo:
+      - echo "deb https://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list
+      - apt-get update
+      - apt-get install -y -t trixie openjdk-21-jdk-headless
+      - update-alternatives --auto java
+    gradle:
+      - foss
+    rm:
+      - app-thunderbird
+      - feature/funding/googleplay
+    prebuild:
+      - sed -i -e 's|maven.mozilla.org/maven2|jitpack.io|' -e '/glean/d' -e '/googleplay/d'
+        -e '/foojay/d' ../settings.gradle.kts
+      - sed -i -e 's/feature.funding.googleplay/feature.funding.link/' build.gradle.kts
+    scandelete:
+      - build-plugin
+
 MaintainerNotes: |-
   Use output instead of subdir to make gradlew-fdroid correctly determine the gradle version to be used.
   It doesn't work when using subdir because we are two levels deep into the directory structure.
@@ -1679,5 +1700,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '13.0'
-CurrentVersionCode: 39029
+CurrentVersion: '14.0'
+CurrentVersionCode: 39030
diff --git a/metadata/net.thunderbird.android.yml b/metadata/net.thunderbird.android.yml
index 531c8e69df..386ac63e02 100644
--- a/metadata/net.thunderbird.android.yml
+++ b/metadata/net.thunderbird.android.yml
@@ -194,6 +194,27 @@ Builds:
     scandelete:
       - build-plugin
 
+  - versionName: '14.0'
+    versionCode: 17
+    commit: 6a29a08483f0e6df9c33ec908b6d9fc51c0dc010
+    subdir: app-thunderbird
+    sudo:
+      - echo "deb https://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/trixie.list
+      - apt-get update
+      - apt-get install -y -t trixie openjdk-21-jdk-headless
+      - update-alternatives --auto java
+    gradle:
+      - foss
+    rm:
+      - app-k9mail
+      - feature/funding/googleplay
+    prebuild:
+      - sed -i -e 's|maven.mozilla.org/maven2|jitpack.io|' -e '/glean/d' -e '/googleplay/d'
+        -e '/foojay/d' ../settings.gradle.kts
+      - sed -i -e 's/feature.funding.googleplay/feature.funding.link/' build.gradle.kts
+    scandelete:
+      - build-plugin
+
 AllowedAPKSigningKeys: b6524779b3dbbc5ac17a5ac271ddb29dcfbf723578c238e03c3c217811356dd1
 
 MaintainerNotes: |-
@@ -215,5 +236,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '13.0'
-CurrentVersionCode: 16
+CurrentVersion: '14.0'
+CurrentVersionCode: 17