Merge remote-tracking branch 'upstream/main' into lite

.github/CONTRIBUTING.md

@@ -1,30 +0,0 @@
-# Thank you for contributing to Delta Chat.
-
-If you like to discuss a **new feature** or submit suggestions,
-please use the community forum:
-
-* <https://support.delta.chat>
-
-If you intend to send a **bug report** for Delta Chat, 
-search for existing bugs first:
-
-* [Core](https://github.com/deltachat/deltachat-core-rust/issues?&q=is%3Aissue)
-* [Android](https://github.com/deltachat/deltachat-android/issues?&q=is%3Aissue)
-* [iOS](https://github.com/deltachat/deltachat-ios/issues?&q=is%3Aissue)
-* [Desktop](https://github.com/deltachat/deltachat-ios/issues?&q=is%3Aissue)
-
-In short, the Android/iOS/Desktop parts are about the User Interface.
-The Core part is about handling the connection to the mail server and the chat 
-or e-mail messages as well as providing secure communication by using 
-[Autocrypt](https://autocrypt.org/en/latest/).
-
-A _bug_ is a reproducable misbehaviour, 
-when something happens but something else should happen instead. 
-
-Please try to create your issue in the respective issue tracker.
-
-Did you know there is a [Help](https://delta.chat/en/help) page for Delta Chat?
-
-To ask questions, you are also invited to join our IRC channel #deltachat
-on [Freenode](https://kiwiirc.com/nextclient/#irc://irc.freenode.net/deltachat).
-

.github/workflows/preview-apk.yml

@@ -11,17 +11,18 @@ jobs:
         uses: styfle/cancel-workflow-action@0.9.1
         with:
           access_token: ${{ github.token }}
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
-      - uses: Swatinem/rust-cache@v1
+      - uses: Swatinem/rust-cache@v2
         with:
           working-directory: jni/deltachat-core-rust
-      - uses: actions/setup-java@v1.4.3
+      - uses: actions/setup-java@v3
         with:
-          java-version: 11
-      - uses: android-actions/setup-android@v2
-      - uses: actions/cache@v2
+          java-version: 17
+          distribution: 'temurin'
+      - uses: android-actions/setup-android@v3
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
@@ -48,7 +49,7 @@ jobs:
         run: ./gradlew --no-daemon assembleGplayDebug
 
       - name: Upload APK
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: app-preview.apk
           path: 'build/outputs/apk/gplay/debug/*.apk'

.github/workflows/release.yml

@@ -53,7 +53,7 @@ jobs:
           echo "DC_RELEASE_STORE_PASSWORD=${{ secrets.KEY_STORE_PASSWORD }}" >> ~/.gradle/gradle.properties
           echo "DC_RELEASE_KEY_ALIAS=${{ secrets.ALIAS }}" >> ~/.gradle/gradle.properties
           echo "DC_RELEASE_KEY_PASSWORD=${{ secrets.KEY_PASSWORD }}" >> ~/.gradle/gradle.properties
-          ./gradlew --no-daemon assembleGplayRelease
+          ./gradlew --no-daemon assembleFossRelease
 
       - name: Release
         uses: softprops/action-gh-release@v1
@@ -62,4 +62,4 @@ jobs:
           body: "WARNING: DeltaChat Lite is not DeltaLab! it is a lightweight version of Delta Chat"
           prerelease: ${{ contains(github.event.ref, '-beta') }}
           fail_on_unmatched_files: true
-          files: build/outputs/apk/gplay/release/*.apk
+          files: build/outputs/apk/foss/release/*.apk