Use Gradle

.github/workflows/check-layouts.yml

@@ -12,8 +12,9 @@ jobs:
   check-layouts:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout repo
-      uses: actions/checkout@v3
-    - run: python3 gen_layouts.py
-    - name: Check that the generated layouts.xml is uptodate, run python3 gen_layouts.py otherwise
-      run: git diff --exit-code
+      - name: Checkout repo
+        uses: actions/checkout@v3
+      - working-directory: ./app
+        run: python3 gen_layouts.py
+      - name: Check that the generated layouts.xml is uptodate, run python3 gen_layouts.py otherwise
+        run: git diff --exit-code

.github/workflows/check-translations.yml

@@ -9,8 +9,9 @@ jobs:
   check-translations:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout repo
-      uses: actions/checkout@v3
-    - run: python3 sync_translations.py
-    - name: Check that strings files are uptodate, run python3 sync_translations.py otherwise
-      run: git diff --exit-code
+      - name: Checkout repo
+        uses: actions/checkout@v3
+      - working-directory: ./app
+        run: python3 sync_translations.py
+      - name: Check that strings files are uptodate, run python3 sync_translations.py otherwise
+        run: git diff --exit-code

.github/workflows/make-apk.yml

@@ -1,47 +1,88 @@
-name: Make Apk CI
+name: Make APKs CI
 
 on:
   workflow_dispatch:
   push:
   pull_request:
 
 jobs:
-  Build-Apk:
+  Build-Apks:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/setup-java@v3
-      with:
-        distribution: 'zulu' # See 'Supported distributions' for available options
-        java-version: '11'
-    - name: Checkout repo
-      uses: actions/checkout@v3
-    - name: Cache debug certificate
-      uses: actions/cache@v3
-      with:
-        path: _build/debug.keystore
-        key: debug-keystore
-    - name: Restore debug keystore from github Secrets 
-      run: |
-        mkdir -p _build
-        cd "_build"
-        # Check if exist and use the secret named DEBUG_KEYSTORE
-        # The contents of the secret can be obtained -
-        #    from the debug.keystore.asc from you local _build folder
-        if [[ ! "${{ secrets.DEBUG_KEYSTORE }}" = "" ]]; then
-            echo "${{ secrets.DEBUG_KEYSTORE }}" > "debug.keystore.asc"
-            if [[ -s "debug.keystore.asc" ]]; then
-                gpg -d --passphrase "debug0" --batch "debug.keystore.asc" > "debug.keystore"
-            fi
-        fi
-    - name: Build
-      run: make
-    - name: Artifact naming
-      run: |
-        artifact="${{github.repository_owner}} ${{github.ref_name}}"
-        artifact="${artifact//\//-}" # replace slashes
-        echo "artifact=${artifact}" >> $GITHUB_ENV
-    - name: Save debug apk
-      uses: actions/upload-artifact@v3
-      with:
-        name: "${{env.artifact}} debug_apk"
-        path: _build/*.apk
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu' # See 'Supported distributions' for available options
+          java-version: '17'
+      - name: Checkout repo
+        uses: actions/checkout@v3
+      - name: Install FontForge
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install fontforge
+      - name: Restore debug keystore from GitHub Secrets
+        run: |
+          # Check if exist and use the secret named DEBUG_KEYSTORE
+          # The contents of the secret can be obtained -
+          #    from the debug.keystore.asc from you local folder (refer to CONTRIBUTING.md#Using the local debug.keystore on the Github CI actions)
+          if [[ ! "${{ secrets.DEBUG_KEYSTORE }}" = "" ]]; then
+              echo "${{ secrets.DEBUG_KEYSTORE }}" > "debug.keystore.asc"
+              if [[ -s "debug.keystore.asc" ]]; then
+                  echo "Restoring debug keystore from GitHub secrets"
+                  gpg -d --passphrase "debug0" --batch "debug.keystore.asc" > "debug.keystore"
+              fi
+          fi
+      - name: Restore release keystore from GitHub Secrets
+        env:
+          RELEASE_KEYSTORE_RAW: ${{ secrets.RELEASE_KEYSTORE }} # Used for condition
+          RELEASE_KEYSTORE_PASSWORD: ${{ secrets.RELEASE_KEYSTORE_PASSWORD }}
+        if: env.RELEASE_KEYSTORE_RAW != ''
+        run: |
+          # Check if exist and use the secret named RELEASE_KEYSTORE
+          # The contents of the secret can be obtained -
+          #    from the release.keystore.asc from you local folder
+          if [[ ! "${{ secrets.RELEASE_KEYSTORE }}" = "" ]]; then
+              echo "${{ secrets.RELEASE_KEYSTORE }}" > "release.keystore.asc"
+              if [[ -s "release.keystore.asc" ]]; then
+                  echo "Restoring release keystore from GitHub secrets"
+                  # Passing secrets as arguments is not recommended since they could be observed by using 'ps'
+                  gpg -d --passphrase "$RELEASE_KEYSTORE_PASSWORD" --batch "release.keystore.asc" > "release.keystore"
+              fi
+          fi
+      - name: Build debug APK
+        uses: gradle/gradle-build-action@v2
+        env:
+          DEBUG_KEYSTORE: "../debug.keystore"
+          DEBUG_KEYSTORE_PASSWORD: debug0
+          DEBUG_KEY_ALIAS: debug
+          DEBUG_KEY_PASSWORD: debug0
+        with:
+          arguments: assembleDebug
+      - name: Build signed release APK
+        env:
+          RELEASE_KEYSTORE_RAW: ${{ secrets.RELEASE_KEYSTORE }} # Used for condition
+          RELEASE_KEYSTORE: "../release.keystore"
+          RELEASE_KEYSTORE_PASSWORD: ${{ secrets.RELEASE_KEYSTORE_PASSWORD }}
+          RELEASE_KEY_ALIAS: ${{ secrets.RELEASE_KEY_ALIAS }}
+          RELEASE_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }}
+        if:  ${{ env.RELEASE_KEYSTORE_RAW != '' }}
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: assembleRelease
+      - name: Artifact naming
+        run: |
+          artifact="${{github.repository_owner}} ${{github.ref_name}}"
+          artifact="${artifact//\//-}" # replace slashes
+          echo "artifact=${artifact}" >> $GITHUB_ENV
+      - name: Upload debug APK
+        uses: actions/upload-artifact@v3
+        with:
+          name: "${{env.artifact}} debug_apk"
+          path: app/build/outputs/apk/debug/*.apk
+      - name: Upload signed release APK
+        env:
+          RELEASE_KEYSTORE_RAW: ${{ secrets.RELEASE_KEYSTORE }} # Used for condition
+        if:  ${{ env.RELEASE_KEYSTORE_RAW != '' }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: "${{env.artifact}} signed_release_apk"
+          path: app/build/outputs/apk/release/*.apk

.gitignore

@@ -2,3 +2,19 @@
 *.keystore.asc
 _build
 /*-keystore.conf
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
+