msrv 160 (#1279)

* bump edition * msrv 160 * upgrade clap and more deps
extrawurst · Aug 17, 2022 · 4a0e58a · 4a0e58a
1 parent 70e6a3d
commit 4a0e58a
Show file tree

Hide file tree

Showing 13 changed files with 509 additions and 294 deletions.
diff --git a/.clippy.toml b/.clippy.toml
@@ -1,2 +1,2 @@
-msrv = "1.50.0"
+msrv = "1.60.0"
 cognitive-complexity-threshold = 18
diff --git a/.github/workflows/cd.yml b/.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

diff --git a/.github/workflows/ci.yml b/.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