From 6c00689c78034e70ce129a42e3aa50c3d30e9445 Mon Sep 17 00:00:00 2001
From: Philipp Kewisch <mozilla@kewis.ch>
Date: Fri, 27 Jun 2025 09:05:29 +0200
Subject: [PATCH] Update K-9 Mail and Thunderbird to 10.1 and 11.0b4

---
 metadata/com.fsck.k9.yml                  | 20 ++++++++++++++++++--
 metadata/net.thunderbird.android.beta.yml | 19 +++++++++++++++++--
 metadata/net.thunderbird.android.yml      | 20 ++++++++++++++++++--
 3 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/metadata/com.fsck.k9.yml b/metadata/com.fsck.k9.yml
index da74e0d776..7b474074d7 100644
--- a/metadata/com.fsck.k9.yml
+++ b/metadata/com.fsck.k9.yml
@@ -1606,6 +1606,22 @@ Builds:
     scandelete:
       - build-plugin/build
 
+  - versionName: '10.1'
+    versionCode: 39024
+    commit: 8679faed3bc8fc39e225e6b1a5a3e4bb4799bf90
+    gradle:
+      - foss
+    output: app-k9mail/build/outputs/apk/foss/release/app-k9mail-foss-release-unsigned.apk
+    rm:
+      - feature/funding/googleplay
+    prebuild:
+      - sed -i -e '/maven.mozilla.org\/maven2/d' -e '/glean/d' -e '/app-thunderbird/d'
+        -e '/googleplay/d' settings.gradle.kts
+      - sed -i -e 's/feature.funding.googleplay/feature.funding.link/' app-k9mail/build.gradle.kts
+      - gradle clean
+    scandelete:
+      - build-plugin/build
+
 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.
@@ -1613,5 +1629,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '10.0'
-CurrentVersionCode: 39023
+CurrentVersion: '10.1'
+CurrentVersionCode: 39024
diff --git a/metadata/net.thunderbird.android.beta.yml b/metadata/net.thunderbird.android.beta.yml
index 5902226bd1..14798387de 100644
--- a/metadata/net.thunderbird.android.beta.yml
+++ b/metadata/net.thunderbird.android.beta.yml
@@ -157,6 +157,21 @@ Builds:
       - build-plugin
     build: gradle assembleFossBeta
 
+  - versionName: 11.0b4
+    versionCode: 17
+    commit: cffc2cced3969f08e18f469a1b02ad29370bdc42
+    output: app-thunderbird/build/outputs/apk/foss/beta/app-thunderbird-foss-beta-unsigned.apk
+    rm:
+      - feature/funding/googleplay
+    prebuild:
+      - sed -i -e 's/maven.mozilla.org/repo1.maven.org/' -e '/glean/d' -e '/app-k9mail/d'
+        -e '/googleplay/d' settings.gradle.kts
+      - sed -i -e 's/feature.funding.googleplay/feature.funding.link/' app-thunderbird/build.gradle.kts
+      - gradle clean
+    scandelete:
+      - build-plugin
+    build: gradle assembleFossBeta
+
 AllowedAPKSigningKeys: 056bfafb450249502fd9226228704c2529e1b822da06760d47a85c9557741fbd
 
 MaintainerNotes: |-
@@ -178,5 +193,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 11.0b3
-CurrentVersionCode: 16
+CurrentVersion: 11.0b4
+CurrentVersionCode: 17
diff --git a/metadata/net.thunderbird.android.yml b/metadata/net.thunderbird.android.yml
index 6fe27f50f3..7072954153 100644
--- a/metadata/net.thunderbird.android.yml
+++ b/metadata/net.thunderbird.android.yml
@@ -98,6 +98,22 @@ Builds:
     scandelete:
       - build-plugin
 
+  - versionName: '10.1'
+    versionCode: 11
+    commit: 8a4fefcc1b8511f415708d507bf86c5cae58ad2a
+    gradle:
+      - foss
+    output: app-thunderbird/build/outputs/apk/foss/release/app-thunderbird-foss-release-unsigned.apk
+    rm:
+      - feature/funding/googleplay
+    prebuild:
+      - sed -i -e '/maven.mozilla.org\/maven2/d' -e '/glean/d' -e '/app-k9mail/d'
+        -e '/googleplay/d' settings.gradle.kts
+      - sed -i -e 's/feature.funding.googleplay/feature.funding.link/' app-thunderbird/build.gradle.kts
+      - gradle clean
+    scandelete:
+      - build-plugin
+
 AllowedAPKSigningKeys: b6524779b3dbbc5ac17a5ac271ddb29dcfbf723578c238e03c3c217811356dd1
 
 MaintainerNotes: |-
@@ -119,5 +135,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '10.0'
-CurrentVersionCode: 10
+CurrentVersion: '10.1'
+CurrentVersionCode: 11