diff --git a/.all-contributorsrc b/.all-contributorsrc index cd865d08..7a9958b9 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -79,6 +79,25 @@ "code" ] }, + { + "login": "stamatiap", + "name": "Stamatia Papageorgiou", + "avatar_url": "https://avatars.githubusercontent.com/u/57223967?v=4", + "profile": "https://github.com/stamatiap", + "contributions": [ + "code", + "translation" + ] + }, + { + "login": "The-EDev", + "name": "Farook Al-Sammarraie", + "avatar_url": "https://avatars.githubusercontent.com/u/60552923?v=4", + "profile": "https://github.com/The-EDev", + "contributions": [ + "code" + ] + }, { "login": "Zopieux", "name": "Alexandre Macabies", diff --git a/.github/workflows/github_nightly_release.yml b/.github/workflows/github_nightly_release.yml index ba4517a2..bddf63b5 100644 --- a/.github/workflows/github_nightly_release.yml +++ b/.github/workflows/github_nightly_release.yml @@ -15,18 +15,19 @@ jobs: uses: actions/checkout@v2 - name: set up JDK 1.8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: - java-version: 1.8 - + distribution: 'zulu' + java-version: '8' + - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build Github unsigned apk - run: ./gradlew assembleGithubRelease --stacktrace --project-prop pre + run: ./gradlew assembleGithubRelease --stacktrace --project-prop pre --project-prop split - name: Sign APK - uses: r0adkll/sign-android-release@v1 + uses: ammargitham/sign-android-release@v1.1.1 # ID used to access action output id: sign_app with: @@ -45,7 +46,8 @@ jobs: uses: actions/upload-artifact@v2 with: name: barinsta_nightly_${{ steps.date.outputs.date }} - path: ${{steps.sign_app.outputs.signedReleaseFile}} + # path: ${{steps.sign_app.outputs.signedReleaseFile}} + path: app/build/outputs/apk/github/release/*-signed.apk # Send success notification - name: Send success Telegram notification @@ -55,7 +57,8 @@ jobs: to: ${{ secrets.TELEGRAM_BUILDS_CHANNEL_TO }} token: ${{ secrets.TELEGRAM_BUILDS_BOT_TOKEN }} message: "${{ github.workflow }} ${{ github.job }} #${{ github.run_number }} completed successfully.\nhttps://github.com/${{github.repository}}/actions/runs/${{github.run_id}}" - document: ${{steps.sign_app.outputs.signedReleaseFile}} + # document: ${{steps.sign_app.outputs.signedReleaseFile}} + document: app/build/outputs/apk/github/release/*-signed.apk # Send failure notification - name: Send failure Telegram notification diff --git a/.github/workflows/github_pre_release.yml b/.github/workflows/github_pre_release.yml index 22bf3620..42d8e481 100644 --- a/.github/workflows/github_pre_release.yml +++ b/.github/workflows/github_pre_release.yml @@ -14,20 +14,21 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 - + - name: set up JDK 1.8 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: - java-version: 1.8 - + distribution: 'zulu' + java-version: '8' + - name: Grant execute permission for gradlew run: chmod +x gradlew - + - name: Build Github unsigned pre-release apk - run: ./gradlew assembleGithubRelease --stacktrace --project-prop pre - + run: ./gradlew assembleGithubRelease --stacktrace --project-prop pre --project-prop split + - name: Sign APK - uses: r0adkll/sign-android-release@v1 + uses: ammargitham/sign-android-release@v1.1.1 # ID used to access action output id: sign_app with: @@ -36,18 +37,19 @@ jobs: alias: ${{ secrets.ALIAS }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} - + - name: Get current date and time id: date run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M%S')" - - # Create artifact + + # Create artifact - name: Create apk artifact uses: actions/upload-artifact@v2 with: name: barinsta_pre-release_${{ steps.date.outputs.date }} - path: ${{steps.sign_app.outputs.signedReleaseFile}} - + # path: ${{steps.sign_app.outputs.signedReleaseFile}} + path: app/build/outputs/apk/github/release/*-signed.apk + # Send success notification - name: Send success Telegram notification if: ${{ success() }} @@ -56,8 +58,9 @@ jobs: to: ${{ secrets.TELEGRAM_BUILDS_CHANNEL_TO }} token: ${{ secrets.TELEGRAM_BUILDS_BOT_TOKEN }} message: "${{ github.workflow }} ${{ github.job }} #${{ github.run_number }} completed successfully.\nURL: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}" - document: ${{steps.sign_app.outputs.signedReleaseFile}} - + # document: ${{steps.sign_app.outputs.signedReleaseFile}} + document: app/build/outputs/apk/github/release/*-signed.apk + # Send failure notification - name: Send failure Telegram notification if: ${{ failure() }} diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 61a9130c..fb7f4a8a 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 23a89bbb..9bba60da 100755 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,7 +7,6 @@