From e6ba076c58b70f249b1fa191cbb2987718b85766 Mon Sep 17 00:00:00 2001 From: ganfra Date: Wed, 22 May 2024 11:47:38 +0200 Subject: [PATCH 1/4] CI : fix release workflow - concurrency group --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3998bc0246..8feecd0db9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: name: Create App Bundle (Gplay) runs-on: ubuntu-latest concurrency: - group: ${{ github.ref == 'refs/head/main' && format('build-release-main-{0}', github.sha) }} + group: ${{ github.ref == 'refs/head/main' && format('build-release-main-gplay-{0}', github.sha) }} cancel-in-progress: true steps: - uses: actions/checkout@v4 @@ -43,7 +43,7 @@ jobs: name: Create APKs (FDroid) runs-on: ubuntu-latest concurrency: - group: ${{ github.ref == 'refs/head/main' && format('build-release-main-{0}', github.sha) }} + group: ${{ github.ref == 'refs/head/main' && format('build-release-main-fdroid-{0}', github.sha) }} cancel-in-progress: true steps: - uses: actions/checkout@v4 From 2f27ba757d85927b56f877ce6fbc0975e1f1fb7c Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 7 Jun 2024 13:46:42 +0200 Subject: [PATCH 2/4] CI : fix the release script for fdroid --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3cb7b27c3a..777381f589 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: name: Create App Bundle (Gplay) runs-on: ubuntu-latest concurrency: - group: ${{ github.ref == 'refs/head/main' && format('build-release-main-gplay-{0}', github.sha) }} + group: ${{ format('build-release-main-gplay-{0}', github.sha) }} cancel-in-progress: true steps: - uses: actions/checkout@v4 @@ -43,7 +43,7 @@ jobs: name: Create APKs (FDroid) runs-on: ubuntu-latest concurrency: - group: ${{ github.ref == 'refs/head/main' && format('build-release-main-fdroid-{0}', github.sha) }} + group: ${{ format('build-release-main-fdroid-{0}', github.sha) }} cancel-in-progress: true steps: - uses: actions/checkout@v4 From 4ecc9f46b6627f89184d66b758094a7c4a24c258 Mon Sep 17 00:00:00 2001 From: ganfra Date: Wed, 28 Aug 2024 16:47:56 +0200 Subject: [PATCH 3/4] Fix maplibre annotation plugins dependency --- gradle/libs.versions.toml | 1 + libraries/maplibre-compose/build.gradle.kts | 2 ++ 2 files changed, 3 insertions(+) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 81f93b1c0e..d6b552feff 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -180,6 +180,7 @@ statemachine = "com.freeletics.flowredux:compose:1.2.2" maplibre = "org.maplibre.gl:android-sdk:11.2.0" maplibre_ktx = "org.maplibre.gl:android-sdk-ktx-v7:3.0.0" maplibre_annotation = "org.maplibre.gl:android-plugin-annotation-v9:3.0.0" +mapbox_android_gestures = "com.mapbox.mapboxsdk:mapbox-android-gestures:0.7.0" opusencoder = "io.element.android:opusencoder:1.1.0" kotlinpoet = "com.squareup:kotlinpoet:1.18.1" zxing_cpp = "io.github.zxing-cpp:android:2.2.0" diff --git a/libraries/maplibre-compose/build.gradle.kts b/libraries/maplibre-compose/build.gradle.kts index e2a9b821ba..b542f853b6 100644 --- a/libraries/maplibre-compose/build.gradle.kts +++ b/libraries/maplibre-compose/build.gradle.kts @@ -31,4 +31,6 @@ dependencies { api(libs.maplibre) api(libs.maplibre.ktx) api(libs.maplibre.annotation) + // needed for libs.maplibre.annotation waiting for a new release with the fix + implementation(libs.mapbox.android.gestures) } From 3247eae5514d431557f188f3871f37ecff30d588 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 10 Sep 2024 09:28:00 +0200 Subject: [PATCH 4/4] Adding fastlane file for version 0.5.3 --- fastlane/metadata/android/en-US/changelogs/40005030.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/40005030.txt diff --git a/fastlane/metadata/android/en-US/changelogs/40005030.txt b/fastlane/metadata/android/en-US/changelogs/40005030.txt new file mode 100644 index 0000000000..cbdff7b20f --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/40005030.txt @@ -0,0 +1,2 @@ +Main changes in this version: mainly bug fixes. +Full changelog: https://github.com/element-hq/element-x-android/releases