Merge branch 'master' into add-bluetooth-share

Author: Myzel394

.github/workflows/build-testing.yaml

@@ -44,6 +44,9 @@ jobs:
       - name: Update pubspec.yaml for FLOSS variant 📝
         run: sed -i -e 's/^#f//' pubspec.yaml
 
+      - name: Update android/app/build.gradle for FLOSS variant 📝
+        run: sed -i -e 's/^\/\/f //' android/app/build.gradle
+
       - name: Install dependencies 📦
         run: flutter pub get
 

.github/workflows/release-app.yaml

@@ -61,20 +61,23 @@ jobs:
           mv app-arm64-v8a-release.apk locus-arm64-gms.apk &&
           mv app-armeabi-v7a-release.apk locus-armeabi-gms.apk &&
           mv app-x86_64-release.apk locus-x86-gms.apk
-      
+
       - name: Upload APKs 🚀
         uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
         with:
           files: 'build/app/outputs/flutter-apk/*.apk'
-          
+
       - name: Clean Flutter
         run: flutter clean
 
       - name: Update pubspec.yaml for FLOSS variant 📝
         run: sed -i -e 's/^#f//' pubspec.yaml
 
+      - name: Update android/app/build.gradle for FLOSS variant 📝
+        run: sed -i -e 's/^\/\/f //' android/app/build.gradle
+
       - name: Install dependencies 📦
         run: flutter pub get
 

android/app/build.gradle

@@ -91,6 +91,7 @@ dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 }
 
-configurations.all {
-    exclude group: 'com.google.android.gms'
-}
+// Remove this for FLOSS version
+//f configurations.all {
+//f    exclude group: 'com.google.android.gms'
+//f }