Merge branch 'master' into wayland_clipboard_support

Author: extrawurst

.clippy.toml

@@ -1,2 +1,2 @@
-msrv = "1.50.0"
+msrv = "1.60.0"
 cognitive-complexity-threshold = 18

.github/workflows/cd.yml

@@ -27,11 +27,6 @@ jobs:
         profile: minimal
         components: clippy
 
-    - name: New Resolver
-      run: |
-        cargo install cargo-modify --force
-        cargo modify new-resolver
-
     - name: Build
       run: cargo build
     - name: Run tests

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        rust: [nightly, stable, '1.50']
+        rust: [nightly, stable, '1.60']
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.rust == 'nightly' }}
 
@@ -48,12 +48,6 @@ jobs:
         profile: minimal
         components: clippy
 
-    - name: New Resolver
-      if: matrix.rust != '1.50'
-      run: |
-        cargo install cargo-modify --force
-        cargo modify new-resolver
-
     - name: Build Debug
       run: |
         cargo build
@@ -86,17 +80,17 @@ jobs:
     - name: Build MSI (windows)
       if: matrix.os == 'windows-latest'
       run: |
-        cargo install cargo-wix --version 0.3.1
+        cargo install cargo-wix --version 0.3.3
         cargo wix --version
-        cargo wix --no-build --nocapture --output ./target/wix/gitui.msi
+        cargo wix -p gitui --no-build --nocapture --output ./target/wix/gitui.msi
         ls -l ./target/wix/gitui.msi
 
   build-linux-musl:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        rust: [nightly, stable, '1.50']
+        rust: [nightly, stable, '1.60']
     continue-on-error: ${{ matrix.rust == 'nightly' }}
     steps:
     - uses: actions/checkout@master
@@ -108,13 +102,6 @@ jobs:
         default: true
         target: x86_64-unknown-linux-musl
 
-    # TODO: remove once we depend on 1.51 as a msrv and resolver is supported by default
-    - name: New Resolver
-      if: matrix.rust != '1.50'
-      run: |
-        cargo install cargo-modify --force
-        cargo modify new-resolver
-
     - name: Setup MUSL
       run: |
         sudo apt-get -qq install musl-tools

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [0.21.0] - 2021-08-17
+
 **popup stacking**
 
 ![popup-stacking](assets/popup-stacking.gif)
@@ -21,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * termux support on andriod [[@PeroSar](https://github.com/PeroSar)] ([#1139](https://github.com/extrawurst/gitui/issues/1139))
 * use `GIT_DIR` and `GIT_WORK_DIR` from environment if set ([#1191](https://github.com/extrawurst/gitui/pull/1191))
 * new [FAQ](./FAQ.md)s page
+* mention macports in install section [[@fs111](https://github.com/fs111)]([#1237](https://github.com/extrawurst/gitui/pull/1237))
 * support copy to clipboard on wayland ([#397](https://github.com/extrawurst/gitui/issues/397))
 
 ### Fixed
@@ -30,6 +33,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * fix stashlist multi marking not updated after dropping ([#1207](https://github.com/extrawurst/gitui/pull/1207))
 * exact matches have a higher priority and are placed to the top of the list when fuzzily finding files ([#1183](https://github.com/extrawurst/gitui/pull/1183))
 
+### Changed
+* minimum supported rust version bumped to 1.60 ([#1279](https://github.com/extrawurst/gitui/pull/1279))
+
 ## [0.20.1] - 2021-01-26
 
 This is was a immediate followup patch release to `0.20` see [release notes](https://github.com/extrawurst/gitui/releases/tag/v0.20.0) for the whole list of goodies in `0.20`.