From eea18fb71c6c73469e57f7dcda4529a085047651 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 18 Jun 2021 21:10:28 +0200 Subject: [PATCH 1/4] Rename towncrier folder from newsfragment to changelog.d --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- CONTRIBUTING.md | 2 +- changelog.d/.gitignore | 1 + {newsfragment => changelog.d}/2449.feature | 0 {newsfragment => changelog.d}/3182.feature | 0 {newsfragment => changelog.d}/3333.bugfix | 0 {newsfragment => changelog.d}/3435.feature | 0 {newsfragment => changelog.d}/3451.feature | 0 {newsfragment => changelog.d}/3457.misc | 0 {newsfragment => changelog.d}/3459.feature | 0 {newsfragment => changelog.d}/3467.misc | 0 {newsfragment => changelog.d}/3479.removal | 0 {newsfragment => changelog.d}/3483.feature | 0 {newsfragment => changelog.d}/3485.feature | 0 {newsfragment => changelog.d}/3501.feature | 0 {newsfragment => changelog.d}/3516.misc | 0 tools/travis/check_pr.sh | 8 ++++---- towncrier.toml | 2 +- 18 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 changelog.d/.gitignore rename {newsfragment => changelog.d}/2449.feature (100%) rename {newsfragment => changelog.d}/3182.feature (100%) rename {newsfragment => changelog.d}/3333.bugfix (100%) rename {newsfragment => changelog.d}/3435.feature (100%) rename {newsfragment => changelog.d}/3451.feature (100%) rename {newsfragment => changelog.d}/3457.misc (100%) rename {newsfragment => changelog.d}/3459.feature (100%) rename {newsfragment => changelog.d}/3467.misc (100%) rename {newsfragment => changelog.d}/3479.removal (100%) rename {newsfragment => changelog.d}/3483.feature (100%) rename {newsfragment => changelog.d}/3485.feature (100%) rename {newsfragment => changelog.d}/3501.feature (100%) rename {newsfragment => changelog.d}/3516.misc (100%) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 501aa6784a..8fbc5602fe 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,6 +5,6 @@ - [ ] Changes has been tested on an Android device or Android emulator with API 21 - [ ] UI change has been tested on both light and dark themes - [ ] Pull request is based on the develop branch -- [ ] Pull request includes a new file under ./newsfragment. See https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md#changelog +- [ ] Pull request includes a new file under ./changelog.d. See https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md#changelog - [ ] Pull request includes screenshots or videos if containing UI changes - [ ] Pull request includes a [sign off](https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.md#sign-off) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7e1758077b..cbff8652cf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,7 +53,7 @@ This project is full Kotlin. Please do not write Java classes. ### Changelog -Please create at least one file under ./newsfragment containing details about your change. Towncrier will be used when preparing the release. +Please create at least one file under ./changelog.d containing details about your change. Towncrier will be used when preparing the release. Towncrier says to use the PR number for the filename, but the issue number is also fine. diff --git a/changelog.d/.gitignore b/changelog.d/.gitignore new file mode 100644 index 0000000000..b722e9e13e --- /dev/null +++ b/changelog.d/.gitignore @@ -0,0 +1 @@ +!.gitignore \ No newline at end of file diff --git a/newsfragment/2449.feature b/changelog.d/2449.feature similarity index 100% rename from newsfragment/2449.feature rename to changelog.d/2449.feature diff --git a/newsfragment/3182.feature b/changelog.d/3182.feature similarity index 100% rename from newsfragment/3182.feature rename to changelog.d/3182.feature diff --git a/newsfragment/3333.bugfix b/changelog.d/3333.bugfix similarity index 100% rename from newsfragment/3333.bugfix rename to changelog.d/3333.bugfix diff --git a/newsfragment/3435.feature b/changelog.d/3435.feature similarity index 100% rename from newsfragment/3435.feature rename to changelog.d/3435.feature diff --git a/newsfragment/3451.feature b/changelog.d/3451.feature similarity index 100% rename from newsfragment/3451.feature rename to changelog.d/3451.feature diff --git a/newsfragment/3457.misc b/changelog.d/3457.misc similarity index 100% rename from newsfragment/3457.misc rename to changelog.d/3457.misc diff --git a/newsfragment/3459.feature b/changelog.d/3459.feature similarity index 100% rename from newsfragment/3459.feature rename to changelog.d/3459.feature diff --git a/newsfragment/3467.misc b/changelog.d/3467.misc similarity index 100% rename from newsfragment/3467.misc rename to changelog.d/3467.misc diff --git a/newsfragment/3479.removal b/changelog.d/3479.removal similarity index 100% rename from newsfragment/3479.removal rename to changelog.d/3479.removal diff --git a/newsfragment/3483.feature b/changelog.d/3483.feature similarity index 100% rename from newsfragment/3483.feature rename to changelog.d/3483.feature diff --git a/newsfragment/3485.feature b/changelog.d/3485.feature similarity index 100% rename from newsfragment/3485.feature rename to changelog.d/3485.feature diff --git a/newsfragment/3501.feature b/changelog.d/3501.feature similarity index 100% rename from newsfragment/3501.feature rename to changelog.d/3501.feature diff --git a/newsfragment/3516.misc b/changelog.d/3516.misc similarity index 100% rename from newsfragment/3516.misc rename to changelog.d/3516.misc diff --git a/tools/travis/check_pr.sh b/tools/travis/check_pr.sh index b797244e55..d8d95879e2 100755 --- a/tools/travis/check_pr.sh +++ b/tools/travis/check_pr.sh @@ -23,7 +23,7 @@ branch=${TRAVIS_BRANCH} # If not on develop, exit, else we cannot get the list of modified files # It is ok to check only when on develop branch if [[ "${branch}" -eq 'develop' ]]; then - echo "Check that a file has been added to /newsfragment" + echo "Check that a file has been added to /changelog.d" else echo "Not on develop branch" exit 0 @@ -37,9 +37,9 @@ listOfModifiedFiles=`git diff --name-only HEAD ${branch}` # echo ${listOfModifiedFiles} -if [[ ${listOfModifiedFiles} = *"newsfragment"* ]]; then - echo "A file has been added to /newsfragment!" +if [[ ${listOfModifiedFiles} = *"changelog.d"* ]]; then + echo "A file has been added to /changelog.d!" else - echo "❌ Please add a file describing your changes in /newsfragment. See https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md#changelog" + echo "❌ Please add a file describing your changes in /changelog.d. See https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md#changelog" exit 1 fi diff --git a/towncrier.toml b/towncrier.toml index 09a927b77f..58af92ff98 100644 --- a/towncrier.toml +++ b/towncrier.toml @@ -1,5 +1,5 @@ [tool.towncrier] -directory = "newsfragment" +directory = "changelog.d" filename = "CHANGES.md" name = "Changes in Element" # Note: there is a bug, if I use title_format, the title is printed twice From d6363a6e1b8c80162bb42999bf323518c8fb7c01 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 18 Jun 2021 21:21:52 +0200 Subject: [PATCH 2/4] Update template and use a more power full configuration --- changelog.d/3501.feature | 2 +- tools/towncrier/template.md | 13 +------------ towncrier.toml | 36 ++++++++++++++++++++++++++++++------ 3 files changed, 32 insertions(+), 19 deletions(-) diff --git a/changelog.d/3501.feature b/changelog.d/3501.feature index c0602dda3f..9c89c0e6ae 100644 --- a/changelog.d/3501.feature +++ b/changelog.d/3501.feature @@ -1 +1 @@ -User defined top level spaces ordering (#3501) \ No newline at end of file +User defined top level spaces ordering \ No newline at end of file diff --git a/tools/towncrier/template.md b/tools/towncrier/template.md index fd160682b5..4e5e96a4ac 100644 --- a/tools/towncrier/template.md +++ b/tools/towncrier/template.md @@ -15,19 +15,8 @@ {% if sections[section] %} {% for category, val in definitions.items() if category in sections[section]%} -{% if definitions[category]['name'] == "Features" %} -Features ✨: -{% elif definitions[category]['name'] == "Bugfixes" %} -Bugfixes 🐛: -{% elif definitions[category]['name'] == "Deprecations and Removals" %} -SDK API changes ⚠️: -{% elif definitions[category]['name'] == "Improved Documentation" %} -Improved Documentation 📚: -{% elif definitions[category]['name'] == "Misc" %} -Other changes: -{% else %} {{ definitions[category]['name'] }} -{% endif %} +{{ underline * definitions[category]['name']|length }} {% if definitions[category]['showcontent'] %} {% for text, values in sections[section][category].items() %} - {{ text }} ({{ values|join(', ') }}) diff --git a/towncrier.toml b/towncrier.toml index 58af92ff98..486ef6f186 100644 --- a/towncrier.toml +++ b/towncrier.toml @@ -1,7 +1,31 @@ [tool.towncrier] -directory = "changelog.d" -filename = "CHANGES.md" -name = "Changes in Element" -# Note: there is a bug, if I use title_format, the title is printed twice -# title_format = "Changes in Element {version} ({project_date})" -template="tools/towncrier/template.md" + directory = "changelog.d" + filename = "CHANGES.md" + name = "Changes in Element" + template = "tools/towncrier/template.md" + issue_format = "[#{issue}](https://github.com/vector-im/element-android/issues/{issue})" + + [[tool.towncrier.type]] + directory = "feature" + name = "Features ✨" + showcontent = true + + [[tool.towncrier.type]] + directory = "bugfix" + name = "Bugfixes 🐛" + showcontent = true + + [[tool.towncrier.type]] + directory = "doc" + name = "Improved Documentation 📚" + showcontent = true + + [[tool.towncrier.type]] + directory = "removal" + name = "SDK API changes ⚠️" + showcontent = true + + [[tool.towncrier.type]] + directory = "misc" + name = "Other changes" + showcontent = true From dcce618fd5aa86f192a64fef51a8ae3874cabc00 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 18 Jun 2021 21:36:57 +0200 Subject: [PATCH 3/4] Release 1.1.10: towncrier --- CHANGES.md | 30 ++++++++++++++++++++++++++++++ changelog.d/2449.feature | 1 - changelog.d/3182.feature | 1 - changelog.d/3333.bugfix | 1 - changelog.d/3435.feature | 1 - changelog.d/3451.feature | 1 - changelog.d/3457.misc | 1 - changelog.d/3459.feature | 2 -- changelog.d/3467.misc | 1 - changelog.d/3479.removal | 1 - changelog.d/3483.feature | 1 - changelog.d/3485.feature | 1 - changelog.d/3501.feature | 1 - changelog.d/3516.misc | 1 - 14 files changed, 30 insertions(+), 14 deletions(-) delete mode 100644 changelog.d/2449.feature delete mode 100644 changelog.d/3182.feature delete mode 100644 changelog.d/3333.bugfix delete mode 100644 changelog.d/3435.feature delete mode 100644 changelog.d/3451.feature delete mode 100644 changelog.d/3457.misc delete mode 100644 changelog.d/3459.feature delete mode 100644 changelog.d/3467.misc delete mode 100644 changelog.d/3479.removal delete mode 100644 changelog.d/3483.feature delete mode 100644 changelog.d/3485.feature delete mode 100644 changelog.d/3501.feature delete mode 100644 changelog.d/3516.misc diff --git a/CHANGES.md b/CHANGES.md index 4dd4fd0cfd..1f4c680f53 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,33 @@ +Changes in Element v1.1.10 (2021-06-18) +======================================= + +Features ✨ +---------- + - Migrate DefaultTypingService, KeysImporter and KeysExporter to coroutines ([#2449](https://github.com/vector-im/element-android/issues/2449)) + - Update Message Composer design ([#3182](https://github.com/vector-im/element-android/issues/3182)) + - Cleanup Epoxy items, and debounce all the clicks ([#3435](https://github.com/vector-im/element-android/issues/3435)) + - Adds support for receiving MSC3086 Asserted Identity events. ([#3451](https://github.com/vector-im/element-android/issues/3451)) + - Migrate to new colors and cleanup the style and theme. Now exported in module :library:ui-styles + Ref: https://material.io/blog/migrate-android-material-components ([#3459](https://github.com/vector-im/element-android/issues/3459)) + - Add option to set aliases for public spaces ([#3483](https://github.com/vector-im/element-android/issues/3483)) + - Add beta warning to private space creation flow ([#3485](https://github.com/vector-im/element-android/issues/3485)) + - User defined top level spaces ordering ([#3501](https://github.com/vector-im/element-android/issues/3501)) + +Bugfixes 🐛 +---------- + - Fix new DMs not always marked as such ([#3333](https://github.com/vector-im/element-android/issues/3333)) + +SDK API changes ⚠️ +------------------ + - Splits SessionAccountDataService and RoomAccountDataService and offers to query RoomAccountDataEvent at the session level. ([#3479](https://github.com/vector-im/element-android/issues/3479)) + +Other changes +------------- + - Move the ability to start a call from dialpad directly to a dedicated tab in the home screen. ([#3457](https://github.com/vector-im/element-android/issues/3457)) + - VoIP: Change hold direction to send-only. ([#3467](https://github.com/vector-im/element-android/issues/3467)) + - Some improvements on DialPad (cursor edition, paste number, small fixes). ([#3516](https://github.com/vector-im/element-android/issues/3516)) + + Changes in Element v1.1.9 (2021-06-02) ====================================== diff --git a/changelog.d/2449.feature b/changelog.d/2449.feature deleted file mode 100644 index 7fca1730b6..0000000000 --- a/changelog.d/2449.feature +++ /dev/null @@ -1 +0,0 @@ -Migrate DefaultTypingService, KeysImporter and KeysExporter to coroutines \ No newline at end of file diff --git a/changelog.d/3182.feature b/changelog.d/3182.feature deleted file mode 100644 index 83eee3c29c..0000000000 --- a/changelog.d/3182.feature +++ /dev/null @@ -1 +0,0 @@ -Update Message Composer design \ No newline at end of file diff --git a/changelog.d/3333.bugfix b/changelog.d/3333.bugfix deleted file mode 100644 index d60f725498..0000000000 --- a/changelog.d/3333.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix new DMs not always marked as such \ No newline at end of file diff --git a/changelog.d/3435.feature b/changelog.d/3435.feature deleted file mode 100644 index 222092924d..0000000000 --- a/changelog.d/3435.feature +++ /dev/null @@ -1 +0,0 @@ -Cleanup Epoxy items, and debounce all the clicks \ No newline at end of file diff --git a/changelog.d/3451.feature b/changelog.d/3451.feature deleted file mode 100644 index dbf1a9b02c..0000000000 --- a/changelog.d/3451.feature +++ /dev/null @@ -1 +0,0 @@ -Adds support for receiving MSC3086 Asserted Identity events. \ No newline at end of file diff --git a/changelog.d/3457.misc b/changelog.d/3457.misc deleted file mode 100644 index 6a70641cfd..0000000000 --- a/changelog.d/3457.misc +++ /dev/null @@ -1 +0,0 @@ -Move the ability to start a call from dialpad directly to a dedicated tab in the home screen. \ No newline at end of file diff --git a/changelog.d/3459.feature b/changelog.d/3459.feature deleted file mode 100644 index ccda58f8b5..0000000000 --- a/changelog.d/3459.feature +++ /dev/null @@ -1,2 +0,0 @@ -Migrate to new colors and cleanup the style and theme. Now exported in module :library:ui-styles -Ref: https://material.io/blog/migrate-android-material-components \ No newline at end of file diff --git a/changelog.d/3467.misc b/changelog.d/3467.misc deleted file mode 100644 index b726da2353..0000000000 --- a/changelog.d/3467.misc +++ /dev/null @@ -1 +0,0 @@ -VoIP: Change hold direction to send-only. \ No newline at end of file diff --git a/changelog.d/3479.removal b/changelog.d/3479.removal deleted file mode 100644 index f492a13f58..0000000000 --- a/changelog.d/3479.removal +++ /dev/null @@ -1 +0,0 @@ -Splits SessionAccountDataService and RoomAccountDataService and offers to query RoomAccountDataEvent at the session level. \ No newline at end of file diff --git a/changelog.d/3483.feature b/changelog.d/3483.feature deleted file mode 100644 index e6c27992ea..0000000000 --- a/changelog.d/3483.feature +++ /dev/null @@ -1 +0,0 @@ -Add option to set aliases for public spaces \ No newline at end of file diff --git a/changelog.d/3485.feature b/changelog.d/3485.feature deleted file mode 100644 index 68c78267be..0000000000 --- a/changelog.d/3485.feature +++ /dev/null @@ -1 +0,0 @@ -Add beta warning to private space creation flow \ No newline at end of file diff --git a/changelog.d/3501.feature b/changelog.d/3501.feature deleted file mode 100644 index 9c89c0e6ae..0000000000 --- a/changelog.d/3501.feature +++ /dev/null @@ -1 +0,0 @@ -User defined top level spaces ordering \ No newline at end of file diff --git a/changelog.d/3516.misc b/changelog.d/3516.misc deleted file mode 100644 index 11b132af21..0000000000 --- a/changelog.d/3516.misc +++ /dev/null @@ -1 +0,0 @@ -Some improvements on DialPad (cursor edition, paste number, small fixes). \ No newline at end of file From d737d81458d0e188a11a4b2561e8bd67fdc485c2 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 18 Jun 2021 21:38:38 +0200 Subject: [PATCH 4/4] Release 1.1.10: fastlane --- fastlane/metadata/android/en-US/changelogs/40101100.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/40101100.txt diff --git a/fastlane/metadata/android/en-US/changelogs/40101100.txt b/fastlane/metadata/android/en-US/changelogs/40101100.txt new file mode 100644 index 0000000000..30543cb102 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/40101100.txt @@ -0,0 +1,2 @@ +Main changes in this version: theme and style update and new features for spaces. +Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.1.10 \ No newline at end of file