chore(merging-upstream): bunch of conflicts to solve

.github/workflows/nightly-builds.yml

@@ -0,0 +1,71 @@
+name: Nightly builds
+
+on:
+  push:
+    branches: [ "master" ]
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+#    - name: Checkout Appkit Repo
+#      uses: actions/checkout@v3
+#      with:
+#        repository: grishka/appkit
+#
+#    - name: set up JDK 17
+#      uses: actions/setup-java@v3
+#      with:
+#        java-version: '17'
+#        distribution: 'corretto'
+#        cache: gradle
+#
+#    - name: Comment out signing config in appkits gradle file
+#      run: |
+#        sed -i 's/sign publishing\.publications\.release/\/\/ sign publishing.publications.release/' appkit/maven-push.gradle
+#
+#    - name: Grant execute permission for gradlew for Appkit
+#      run: chmod +x gradlew
+#
+#    - name: Compile appkit
+#      run: ./gradlew publishToMavenLocal
+      
+    - uses: actions/checkout@v3
+    - name: set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'corretto'
+        cache: gradle
+    
+    - name: Get current date
+      id: date
+      run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    
+    - name: Decode Keystore
+      id: decode_keystore
+      uses: timheuer/base64-to-file@v1
+      with:
+        fileName: 'nightly_keystore.jks'  
+        fileDir: './mastodon/keystore/'
+        encodedString: ${{ secrets.KEYSTORE }}
+    
+    - name: Build with Gradle
+      run: ./gradlew assembleNightly
+      env:
+          SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
+          SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
+          SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
+          CURRENT_DATE: ${{ steps.date.outputs.date }}
+      
+    - name: Upload a Build Artifact
+      uses: actions/upload-artifact@v3.1.2
+      with:
+       name: moshidon-nightly.apk
+       path: ./mastodon/build/outputs/apk/nightly/moshidon-nightly.apk

.github/workflows/validate-gradle-wrapper.yml

@@ -0,0 +1,11 @@
+name: Validate Gradle Wrapper
+
+on: [pull_request, push]
+
+jobs:
+  validation:
+    name: Validation
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: gradle/wrapper-validation-action@v1