junegunn/uniseg -> rivo/uniseg

https://github.com/rivo/uniseg/pull/47

9 files changed, 16 insertions, 12 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c750d77f..41fbac88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+0.46.1
+------
+- Fixed Windows binaries
+- Downgraded Go version to 1.20 to support older versions of Windows
+    - https://tip.golang.org/doc/go1.21#windows
+- Updated [rivo/uniseg](https://github.com/rivo/uniseg) dependency to v0.4.5
+
 0.46.0
 ------
 - Added two new events
diff --git a/go.mod b/go.mod
index 64e7e7cb..7752c4fa 100644
--- a/go.mod
+++ b/go.mod
@@ -2,9 +2,9 @@ module github.com/junegunn/fzf
 
 require (
 	github.com/gdamore/tcell/v2 v2.5.4
-	github.com/junegunn/uniseg v0.0.0-20240120174029-b504da4f6ed2
 	github.com/mattn/go-isatty v0.0.17
 	github.com/mattn/go-shellwords v1.0.12
+	github.com/rivo/uniseg v0.4.5
 	github.com/saracen/walker v0.1.3
 	golang.org/x/sys v0.16.0
 	golang.org/x/term v0.16.0
@@ -14,7 +14,6 @@ require (
 	github.com/gdamore/encoding v1.0.0 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
-	github.com/rivo/uniseg v0.4.4 // indirect
 	golang.org/x/sync v0.5.0 // indirect
 	golang.org/x/text v0.5.0 // indirect
 )
diff --git a/go.sum b/go.sum
index 9945377d..dbfabf6b 100644
--- a/go.sum
+++ b/go.sum
@@ -2,8 +2,6 @@ github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdk
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
 github.com/gdamore/tcell/v2 v2.5.4 h1:TGU4tSjD3sCL788vFNeJnTdzpNKIw1H5dgLnJRQVv/k=
 github.com/gdamore/tcell/v2 v2.5.4/go.mod h1:dZgRy5v4iMobMEcWNYBtREnDZAT9DYmfqIkrgEMxLyw=
-github.com/junegunn/uniseg v0.0.0-20240120174029-b504da4f6ed2 h1:oEwPBh29BPu1MaTsz2dM9bDrkOgKBoYFC0u6uY2izWo=
-github.com/junegunn/uniseg v0.0.0-20240120174029-b504da4f6ed2/go.mod h1:ywqF55XaSE3/uS2tkJqVFKiE0oIYAXRvU2N7DU4y3XQ=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
@@ -13,8 +11,8 @@ github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh
 github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
 github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
-github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/rivo/uniseg v0.4.5 h1:I1LlsYBcfG4ggKsNaL6bi8pL7Z8SizVPVBrh3Y8F/BA=
+github.com/rivo/uniseg v0.4.5/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/saracen/walker v0.1.3 h1:YtcKKmpRPy6XJTHJ75J2QYXXZYWnZNQxPCVqZSHVV/g=
 github.com/saracen/walker v0.1.3/go.mod h1:FU+7qU8DeQQgSZDmmThMJi93kPkLFgy0oVAcLxurjIk=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
diff --git a/src/options.go b/src/options.go
index 8f1a5d6c..dcb70dcb 100644
--- a/src/options.go
+++ b/src/options.go
@@ -11,9 +11,9 @@ import (
 	"github.com/junegunn/fzf/src/algo"
 	"github.com/junegunn/fzf/src/tui"
 	"github.com/junegunn/fzf/src/util"
-	"github.com/junegunn/uniseg"
 
 	"github.com/mattn/go-shellwords"
+	"github.com/rivo/uniseg"
 )
 
 const usage = `usage: fzf [options]
diff --git a/src/terminal.go b/src/terminal.go
index 9a4640d2..a1547ffb 100644
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -17,7 +17,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/junegunn/uniseg"
+	"github.com/rivo/uniseg"
 
 	"github.com/junegunn/fzf/src/tui"
 	"github.com/junegunn/fzf/src/util"
diff --git a/src/tui/light.go b/src/tui/light.go
index aee2510e..a5911524 100644
--- a/src/tui/light.go
+++ b/src/tui/light.go
@@ -10,7 +10,7 @@ import (
 	"time"
 	"unicode/utf8"
 
-	"github.com/junegunn/uniseg"
+	"github.com/rivo/uniseg"
 
 	"golang.org/x/term"
 )
diff --git a/src/tui/tcell.go b/src/tui/tcell.go
index bfd870dc..9036c336 100644
--- a/src/tui/tcell.go
+++ b/src/tui/tcell.go
@@ -10,7 +10,7 @@ import (
 	"github.com/gdamore/tcell/v2/encoding"
 	"github.com/junegunn/fzf/src/util"
 
-	"github.com/junegunn/uniseg"
+	"github.com/rivo/uniseg"
 )
 
 func HasFullscreenRenderer() bool {
diff --git a/src/tui/tui.go b/src/tui/tui.go
index 60fbe692..022fae34 100644
--- a/src/tui/tui.go
+++ b/src/tui/tui.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/junegunn/uniseg"
+	"github.com/rivo/uniseg"
 )
 
 // Types of user action
diff --git a/src/util/util.go b/src/util/util.go
index 46950812..190d34d5 100644
--- a/src/util/util.go
+++ b/src/util/util.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/junegunn/uniseg"
 	"github.com/mattn/go-isatty"
+	"github.com/rivo/uniseg"
 )
 
 // StringWidth returns string width where each CR/LF character takes 1 column