From 74c8e94a57680f2ff86542c83d96eaf1d63926d0 Mon Sep 17 00:00:00 2001 From: ganfra Date: Wed, 27 Sep 2023 13:42:12 +0200 Subject: [PATCH 1/4] Update _developer_onboarding.md --- docs/_developer_onboarding.md | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/docs/_developer_onboarding.md b/docs/_developer_onboarding.md index 8a587b5a08..9adab209fa 100644 --- a/docs/_developer_onboarding.md +++ b/docs/_developer_onboarding.md @@ -120,18 +120,9 @@ You can also have access to the aars through the [release](https://github.com/ma If you need to locally build the sdk-android you can use the [build](https://github.com/matrix-org/matrix-rust-components-kotlin/blob/main/scripts/build.sh) script. -For this, you first need to ensure to setup : +For this please check the [prerequisites](https://github.com/matrix-org/matrix-rust-components-kotlin/blob/main/README.md#prerequisites) from the repo. -- rust environment (check https://rust-lang.github.io/rustup/ if needed) -- cargo-ndk < 2.12.0 -```shell -cargo install cargo-ndk --version 2.11.0 -``` -- android targets -```shell -rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android i686-linux-android -``` -- checkout both [matrix-rust-sdk](https://github.com/matrix-org/matrix-rust-sdk) and [matrix-rust-components-kotlin](https://github.com/matrix-org/matrix-rust-components-kotlin) repositories +Checkout both [matrix-rust-sdk](https://github.com/matrix-org/matrix-rust-sdk) and [matrix-rust-components-kotlin](https://github.com/matrix-org/matrix-rust-components-kotlin) repositories ```shell git clone git@github.com:matrix-org/matrix-rust-sdk.git git clone git@github.com:matrix-org/matrix-rust-components-kotlin.git From f259917a08681f79af6e7bc69b20ed09afadd355 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 27 Sep 2023 14:21:55 +0200 Subject: [PATCH 2/4] Changelog for version 0.2.3 --- CHANGES.md | 13 +++++++++++++ changelog.d/1434.misc | 1 - 2 files changed, 13 insertions(+), 1 deletion(-) delete mode 100644 changelog.d/1434.misc diff --git a/CHANGES.md b/CHANGES.md index beb480dd45..96fc743ee3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,16 @@ +Changes in Element X v0.2.3 (2023-09-27) +======================================== + +Features ✨ +---------- + - Handle installation of Apks from the media viewer. ([#1432](https://github.com/vector-im/element-x-android/pull/1432)) + - Integrate SDK 0.1.58 ([#1437](https://github.com/vector-im/element-x-android/pull/1437)) + +Other changes +------------- + - Element call: add custom parameters to Element Call urls. ([#1434](https://github.com/vector-im/element-x-android/issues/1434)) + + Changes in Element X v0.2.2 (2023-09-21) ======================================== diff --git a/changelog.d/1434.misc b/changelog.d/1434.misc deleted file mode 100644 index 8babe4771a..0000000000 --- a/changelog.d/1434.misc +++ /dev/null @@ -1 +0,0 @@ -Element call: add custom parameters to Element Call urls. From 0a80a7f23fab78dcd5095770346d83b04b38357b Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 27 Sep 2023 14:22:09 +0200 Subject: [PATCH 3/4] Adding fastlane file for version 0.2.3 --- fastlane/metadata/android/en-US/changelogs/40002030.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/40002030.txt diff --git a/fastlane/metadata/android/en-US/changelogs/40002030.txt b/fastlane/metadata/android/en-US/changelogs/40002030.txt new file mode 100644 index 0000000000..ff4f86ce7e --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/40002030.txt @@ -0,0 +1,2 @@ +Main changes in this version: bugfixes. +Full changelog: https://github.com/vector-im/element-x-android/releases From 4bff9a8fa6149422c8d7dac517e6d2e345525d41 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 27 Sep 2023 14:23:04 +0200 Subject: [PATCH 4/4] version++ --- plugins/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/src/main/kotlin/Versions.kt b/plugins/src/main/kotlin/Versions.kt index f34cdfbdc0..45e5b4adfd 100644 --- a/plugins/src/main/kotlin/Versions.kt +++ b/plugins/src/main/kotlin/Versions.kt @@ -56,7 +56,7 @@ private const val versionMinor = 2 // Note: even values are reserved for regular release, odd values for hotfix release. // When creating a hotfix, you should decrease the value, since the current value // is the value for the next regular release. -private const val versionPatch = 3 +private const val versionPatch = 4 object Versions { val versionCode = 4_000_000 + versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch