From d16bade426f0bcc2dea9a3e5a2f67f46e8bf118b Mon Sep 17 00:00:00 2001 From: Jan De Dobbeleer Date: Wed, 1 Sep 2021 13:23:21 +0200 Subject: [PATCH] feat: update to go 1.17 --- .github/workflows/artifacts.yml | 2 +- .github/workflows/code.yml | 2 +- .github/workflows/codeql.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/gomod.yml | 2 +- .github/workflows/release.yml | 2 +- docs/docs/contributing-started.mdx | 2 +- src/go.mod | 23 ++++++++++++++++++++++- 8 files changed, 29 insertions(+), 8 deletions(-) diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml index 113456d4..858bb541 100644 --- a/.github/workflows/artifacts.yml +++ b/.github/workflows/artifacts.yml @@ -28,7 +28,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.17 - name: Checkout code uses: actions/checkout@v2 - name: Build diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml index 253bdb4d..df0c1733 100644 --- a/.github/workflows/code.yml +++ b/.github/workflows/code.yml @@ -22,7 +22,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.17 - name: Checkout code uses: actions/checkout@v2 - name: Golang CI diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index afad5887..64879d85 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -22,7 +22,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.17 - name: Checkout code uses: actions/checkout@v2 - name: Initialize CodeQL diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 588887dc..481fec11 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -20,7 +20,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.17 - name: Build oh-my-posh 🔧 run: | cd src diff --git a/.github/workflows/gomod.yml b/.github/workflows/gomod.yml index e02980f7..cfa6a861 100644 --- a/.github/workflows/gomod.yml +++ b/.github/workflows/gomod.yml @@ -12,7 +12,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.17 - name: Checkout code uses: actions/checkout@v2 - name: Check for unused dependencies diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1820c976..fc428a55 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,7 +62,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.17 - name: Checkout code uses: actions/checkout@v2 - name: Asset name diff --git a/docs/docs/contributing-started.mdx b/docs/docs/contributing-started.mdx index 95fdf192..8ba43470 100644 --- a/docs/docs/contributing-started.mdx +++ b/docs/docs/contributing-started.mdx @@ -12,7 +12,7 @@ The codebase is in [go][go], meaning we need a working go setup before we can do Have a look at the [go guide][go-started] to get up and running with go in no time! :::info -Oh My Posh needs at least go 1.16. +Oh My Posh needs at least go 1.17. ::: ### golangci-lint diff --git a/src/go.mod b/src/go.mod index 94f02a3f..2edeb08c 100644 --- a/src/go.mod +++ b/src/go.mod @@ -1,6 +1,6 @@ module github.com/jandedobbeleer/oh-my-posh -go 1.16 +go 1.17 require ( github.com/BurntSushi/toml v0.4.1 // indirect @@ -35,4 +35,25 @@ require ( howett.net/plist v0.0.0-20201203080718-1454fab16a06 // indirect ) +require ( + github.com/Masterminds/goutils v1.1.1 // indirect + github.com/Masterminds/semver/v3 v3.1.1 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/go-ole/go-ole v1.2.5 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/json-iterator/go v1.1.11 // indirect + github.com/mattn/go-isatty v0.0.13 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/shopspring/decimal v1.2.0 // indirect + github.com/spf13/cast v1.3.1 // indirect + github.com/tklauser/numcpus v0.2.3 // indirect + github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect +) + replace github.com/distatus/battery v0.10.0 => github.com/JanDeDobbeleer/battery v0.10.0-2