Merge branch 'release/1.1.0'

Author: LaurentTreguier

.gitattributes

@@ -0,0 +1,3 @@
+* text=auto
+gradlew eol=lf
+gradlew.bat eol=crlf

.github/workflows/publishing.yml

@@ -12,19 +12,20 @@ on:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     environment: google-play-store
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           submodules: true
 
-      - uses: actions/setup-java@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'gradle'
 
       - name: Set up keystore
@@ -37,72 +38,106 @@ jobs:
           GOOGLE_SERVICES_B64: ${{ secrets.GOOGLE_SERVICES_B64 }}
         run: echo $GOOGLE_SERVICES_B64 | base64 --decode > app/google-services.json
 
-      - name: Build APKs
+      - name: Build app
         env:
           KEYSTORE_PATH: /tmp/fyreplace.keystore
           KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
-          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+          KEY_ALIAS: ${{ vars.KEY_ALIAS }}
           KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-        run: ./gradlew assembleRelease
-
-      - name: Build bundles
-        env:
-          KEYSTORE_PATH: /tmp/fyreplace.keystore
-          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
-          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
-          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-        run: ./gradlew bundleRelease
-
-      - uses: actions/upload-artifact@v4
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+          SENTRY_ORG: ${{ vars.SENTRY_ORG }}
+          SENTRY_PROJECT: ${{ vars.SENTRY_PROJECT }}
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        run: |
+          ./gradlew \
+            assembleLegacyGoogleRelease \
+            assembleLegacyLibreRelease \
+            bundleLegacyGoogleRelease \
+            bundleLegacyLibreRelease
+
+      - name: Upload Google APK
+        uses: actions/upload-artifact@v4
         with:
-          name: Fyreplace.apk
-          path: app/build/outputs/apk/google/release/*.apk
+          name: Fyreplace.google.apk
+          path: app/build/outputs/apk/legacyGoogle/release/app-legacy-google-release.apk
           if-no-files-found: error
 
-      - uses: actions/upload-artifact@v4
+      - name: Upload Libre APK
+        uses: actions/upload-artifact@v4
         with:
-          name: Fyreplace-libre.apk
-          path: app/build/outputs/apk/libre/release/*.apk
+          name: Fyreplace.libre.apk
+          path: app/build/outputs/apk/legacyLibre/release/app-legacy-libre-release.apk
           if-no-files-found: error
 
-      - uses: actions/upload-artifact@v4
+      - name: Upload Google AAB
+        uses: actions/upload-artifact@v4
         with:
-          name: Fyreplace.aab
-          path: app/build/outputs/bundle/googleRelease/*.aab
+          name: Fyreplace.google.aab
+          path: app/build/outputs/bundle/legacyGoogleRelease/app-legacy-google-release.aab
           if-no-files-found: error
 
-      - uses: actions/upload-artifact@v4
+      - name: Upload Libre AAB
+        uses: actions/upload-artifact@v4
         with:
-          name: Fyreplace-libre.aab
-          path: app/build/outputs/bundle/libreRelease/*.aab
+          name: Fyreplace.libre.aab
+          path: app/build/outputs/bundle/legacyLibreRelease/app-legacy-libre-release.aab
           if-no-files-found: error
 
+  test:
+    name: Test
+    runs-on: ubuntu-24.04
+    environment: google-play-store
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+          submodules: true
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+          cache: 'gradle'
+
+      - name: Set up Google services
+        env:
+          GOOGLE_SERVICES_B64: ${{ secrets.GOOGLE_SERVICES_DEBUG_B64 }}
+        run: echo $GOOGLE_SERVICES_B64 | base64 --decode > app/google-services.json
+
+      - name: Run tests
+        run: ./gradlew assembleNextGoogleDebug test
+
   publish:
     name: Publish
-    needs: build
-    runs-on: ubuntu-latest
+    needs:
+      - build
+      - test
+    runs-on: ubuntu-24.04
     environment: google-play-store
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           submodules: true
 
       - name: Set up artifact directory
         run: mkdir -p build
 
-      - uses: actions/download-artifact@v4
+      - name: Download Google AAB
+        uses: actions/download-artifact@v5
         with:
-          name: Fyreplace.aab
+          name: Fyreplace.google.aab
           path: build
 
       - name: Set up Google service account
         env:
           GCLOUD_SERVICE_ACCOUNT_CREDENTIALS_B64: ${{ secrets.GCLOUD_SERVICE_ACCOUNT_CREDENTIALS_B64 }}
         run: echo $GCLOUD_SERVICE_ACCOUNT_CREDENTIALS_B64 | base64 --decode > build/google-service-account.json
 
-      - name: Upload bundle to Google Play
+      - name: Upload AAB to Google Play
         run: |
           case "${{ github.ref_name }}" in
           v*.*.*)
@@ -117,4 +152,4 @@ jobs:
             --changes_not_sent_for_review true \
             --json_key build/google-service-account.json \
             --aab build/*.aab \
-            --package_name ${{ secrets.PACKAGE_NAME }}
+            --package_name ${{ vars.PACKAGE_NAME }}

.gitignore

@@ -1,9 +1,10 @@
-.DS_Store
 *.iml
 .gradle
-local.properties
-build
-captures
+/local.properties
+/.idea
+.DS_Store
+/build
+/captures
 .externalNativeBuild
 .cxx
-key.properties
+local.properties

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "app/src/main/proto/protos"]
-	path = app/src/main/proto/protos
+[submodule "app/src/legacy/proto/protos"]
+	path = app/src/legacy/proto/protos
 	url = https://github.com/fyreplace/fyreplace-protos.git