K9 & Thunderbird - updates

metadata/com.fsck.k9.yml

@@ -1573,6 +1573,22 @@ Builds:
     scandelete:
       - build-plugin/build
 
+  - versionName: '9.0'
+    versionCode: 39022
+    commit: efcb74d99db9461ca640d59f2236caa9e6a3e82b
+    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.
@@ -1580,5 +1596,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '8.2'
-CurrentVersionCode: 39019
+CurrentVersion: '9.0'
+CurrentVersionCode: 39022

metadata/net.thunderbird.android.beta.yml

@@ -14,6 +14,7 @@ AutoName: Thunderbird Beta for Testers
 
 RepoType: git
 Repo: https://github.com/thunderbird/thunderbird-android.git
+Binaries: https://ftp.mozilla.org/pub/thunderbird-mobile/android/releases/%v/thunderbird-%v.apk
 
 Builds:
   - versionName: 8.0b3
@@ -80,6 +81,21 @@ Builds:
       - build-plugin
     build: gradle assembleFossBeta
 
+  - versionName: 10.0b1
+    versionCode: 12
+    commit: 752b04ad7212ff5700b0e8696475f1c3a6e5e601
+    output: app-thunderbird/build/outputs/apk/foss/beta/app-thunderbird-foss-beta-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
+    build: gradle assembleFossBeta
+
 AllowedAPKSigningKeys: 056bfafb450249502fd9226228704c2529e1b822da06760d47a85c9557741fbd
 
 MaintainerNotes: |-
@@ -101,5 +117,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 9.0b3
-CurrentVersionCode: 11
+CurrentVersion: 10.0b1
+CurrentVersionCode: 12

metadata/net.thunderbird.android.yml

@@ -65,6 +65,22 @@ Builds:
     scandelete:
       - build-plugin
 
+  - versionName: '9.0'
+    versionCode: 9
+    commit: 53354f04f64bb72b6fac9d8367b14ca8b1cec178
+    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: |-
@@ -86,5 +102,5 @@ MaintainerNotes: |-
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: '8.2'
-CurrentVersionCode: 8
+CurrentVersion: '9.0'
+CurrentVersionCode: 9