Skip to content

Commit d78ae80

Browse files
bmartybmarty
committed
Merge branch 'release/0.4.2' into main
2 parents 3f0a42b + c06af4b commit d78ae80

File tree

510 files changed

+5596
-1355
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

510 files changed

+5596
-1355
lines changed

‎.github/workflows/build.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
distribution: 'temurin' # See 'Supported distributions' for available options
3939
java-version: '17'
4040
- name: Configure gradle
41-
uses: gradle/gradle-build-action@v2.11.1
41+
uses: gradle/gradle-build-action@v2.12.0
4242
with:
4343
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
4444
- name: Assemble debug APK
@@ -47,14 +47,15 @@ jobs:
4747
ELEMENT_ANDROID_MAPTILER_API_KEY: ${{ secrets.MAPTILER_KEY }}
4848
ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
4949
ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
50-
run: ./gradlew :app:assembleDebug -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
50+
run: ./gradlew :app:assembleGplayDebug :app:assembleFDroidDebug -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
5151
- name: Upload APK APKs
5252
if: ${{ matrix.variant == 'debug' }}
5353
uses: actions/upload-artifact@v4
5454
with:
5555
name: elementx-debug
5656
path: |
57-
app/build/outputs/apk/debug/*.apk
57+
app/build/outputs/apk/gplay/debug/*.apk
58+
app/build/outputs/apk/fdroid/debug/*.apk
5859
- uses: rnkdsh/[email protected]
5960
id: diawi
6061
# Do not fail the whole build if Diawi upload fails
@@ -64,7 +65,7 @@ jobs:
6465
if: ${{ matrix.variant == 'debug' && github.event_name == 'pull_request' && env.token != '' }}
6566
with:
6667
token: ${{ env.token }}
67-
file: app/build/outputs/apk/debug/app-arm64-v8a-debug.apk
68+
file: app/build/outputs/apk/gplay/debug/app-gplay-arm64-v8a-debug.apk
6869
- name: Add or update PR comment with QR Code to download APK.
6970
if: ${{ matrix.variant == 'debug' && github.event_name == 'pull_request' && steps.diawi.conclusion == 'success' }}
7071
uses: NejcZdovc/comment-pr@v2
@@ -82,7 +83,7 @@ jobs:
8283
run: ./gradlew compileReleaseSources -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
8384
- name: Compile nightly sources
8485
if: ${{ matrix.variant == 'nightly' }}
85-
run: ./gradlew compileNightlySources -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
86+
run: ./gradlew compileGplayNightlySources -PallWarningsAsErrors=true $CI_GRADLE_ARG_PROPERTIES
8687
- name: Compile samples minimal
8788
if: ${{ matrix.variant == 'samples' }}
8889
run: ./gradlew :samples:minimal:assemble $CI_GRADLE_ARG_PROPERTIES

‎.github/workflows/gradle-wrapper-validation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ jobs:
1212
# No concurrency required, this is a prerequisite to other actions and should run every time.
1313
steps:
1414
- uses: actions/checkout@v4
15-
- uses: gradle/wrapper-validation-action@v1
15+
- uses: gradle/wrapper-validation-action@v2

‎.github/workflows/maestro.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
api-key: ${{ secrets.MAESTRO_CLOUD_API_KEY }}
5454
# Doc says (https://github.com/mobile-dev-inc/action-maestro-cloud#android):
5555
# app-file should point to an x86 compatible APK file, so upload the x86_64 one (much smaller than the universal APK).
56-
app-file: app/build/outputs/apk/debug/app-x86_64-debug.apk
56+
app-file: app/build/outputs/apk/gplay/debug/app-gplay-x86_64-debug.apk
5757
env: |
5858
USERNAME=maestroelement
5959
PASSWORD=${{ secrets.MATRIX_MAESTRO_ACCOUNT_PASSWORD }}

‎.github/workflows/nightly.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
yes n | towncrier build --version nightly
3434
- name: Build and upload Nightly application
3535
run: |
36-
./gradlew assembleNightly appDistributionUploadNightly $CI_GRADLE_ARG_PROPERTIES
36+
./gradlew assembleGplayNightly appDistributionUploadGplayNightly $CI_GRADLE_ARG_PROPERTIES
3737
env:
3838
ELEMENT_ANDROID_MAPTILER_API_KEY: ${{ secrets.MAPTILER_KEY }}
3939
ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
@@ -45,7 +45,7 @@ jobs:
4545
- name: Additionally upload Nightly APK to browserstack for testing
4646
continue-on-error: true # don't block anything by this upload failing (for now)
4747
run: |
48-
curl -u "$BROWSERSTACK_USERNAME:$BROWSERSTACK_PASSWORD" -X POST "https://api-cloud.browserstack.com/app-automate/upload" -F "file=@app/build/outputs/apk/nightly/app-universal-nightly.apk" -F "custom_id=element-x-android-nightly"
48+
curl -u "$BROWSERSTACK_USERNAME:$BROWSERSTACK_PASSWORD" -X POST "https://api-cloud.browserstack.com/app-automate/upload" -F "file=@app/build/outputs/apk/gplay/nightly/app-gplay-universal-nightly.apk" -F "custom_id=element-x-android-nightly"
4949
env:
5050
BROWSERSTACK_USERNAME: ${{ secrets.ELEMENT_ANDROID_BROWSERSTACK_USERNAME }}
5151
BROWSERSTACK_PASSWORD: ${{ secrets.ELEMENT_ANDROID_BROWSERSTACK_ACCESS_KEY }}

‎.github/workflows/nightlyReports.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
distribution: 'temurin' # See 'Supported distributions' for available options
6363
java-version: '17'
6464
- name: Configure gradle
65-
uses: gradle/gradle-build-action@v2.11.1
65+
uses: gradle/gradle-build-action@v2.12.0
6666
with:
6767
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
6868
- name: Dependency analysis

‎.github/workflows/quality.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
distribution: 'temurin' # See 'Supported distributions' for available options
4141
java-version: '17'
4242
- name: Configure gradle
43-
uses: gradle/gradle-build-action@v2.11.1
43+
uses: gradle/gradle-build-action@v2.12.0
4444
with:
4545
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
4646
- name: Run code quality check suite

‎.github/workflows/recordScreenshots.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
java-version: '17'
4040
# Add gradle cache, this should speed up the process
4141
- name: Configure gradle
42-
uses: gradle/gradle-build-action@v2.11.1
42+
uses: gradle/gradle-build-action@v2.12.0
4343
with:
4444
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
4545
- name: Record screenshots

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ jobs:
2525
distribution: 'temurin' # See 'Supported distributions' for available options
2626
java-version: '17'
2727
- name: Configure gradle
28-
uses: gradle/gradle-build-action@v2.11.1
28+
uses: gradle/gradle-build-action@v2.12.0
2929
- name: Create app bundle
3030
env:
3131
ELEMENT_ANDROID_MAPTILER_API_KEY: ${{ secrets.MAPTILER_KEY }}
3232
ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
3333
ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
34-
run: ./gradlew bundleRelease $CI_GRADLE_ARG_PROPERTIES
34+
run: ./gradlew bundleGplayRelease $CI_GRADLE_ARG_PROPERTIES
3535
- name: Upload bundle as artifact
3636
uses: actions/upload-artifact@v4
3737
with:
38-
name: elementx-app-bundle-unsigned
38+
name: elementx-app-gplay-bundle-unsigned
3939
path: |
40-
app/build/outputs/bundle/release/app-release.aab
40+
app/build/outputs/bundle/gplayRelease/app-gplay-release.aab

‎.github/workflows/sonar.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
distribution: 'temurin' # See 'Supported distributions' for available options
3333
java-version: '17'
3434
- name: Configure gradle
35-
uses: gradle/gradle-build-action@v2.11.1
35+
uses: gradle/gradle-build-action@v2.12.0
3636
with:
3737
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
3838
- name: 🔊 Publish results to Sonar

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
distribution: 'temurin' # See 'Supported distributions' for available options
4545
java-version: '17'
4646
- name: Configure gradle
47-
uses: gradle/gradle-build-action@v2.11.1
47+
uses: gradle/gradle-build-action@v2.12.0
4848
with:
4949
cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
5050

0 commit comments

Comments
 (0)