fixup! simplelru: update dependencies

darvaza-proxy · Sep 21, 2023 · 9bf0f8a · 9bf0f8a
1 parent f4405ec
commit 9bf0f8a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 20 deletions.
diff --git a/x/groupcache/go.mod b/x/groupcache/go.mod
@@ -6,8 +6,8 @@ replace darvaza.org/cache => ../../
 
 require (
  darvaza.org/cache v0.2.2
- darvaza.org/core v0.9.7
- darvaza.org/slog v0.5.3
+ darvaza.org/core v0.9.9
+ darvaza.org/slog v0.5.4
  github.com/mailgun/groupcache/v2 v2.5.0
 )
 
@@ -16,11 +16,7 @@ require (
  github.com/google/go-cmp v0.5.9 // indirect
  github.com/segmentio/fasthash v1.0.3 // indirect
  github.com/sirupsen/logrus v1.9.3 // indirect
-<<<<<<< Updated upstream
- golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
-=======
  github.com/stretchr/testify v1.8.4 // indirect
->>>>>>> Stashed changes
  golang.org/x/net v0.15.0 // indirect
  golang.org/x/sys v0.12.0 // indirect
  golang.org/x/text v0.13.0 // indirect

diff --git a/x/groupcache/go.sum b/x/groupcache/go.sum
@@ -1,7 +1,7 @@
-darvaza.org/core v0.9.7 h1:06htj8yzZ5xIrcYpmjdPBmTg1+y1oHbpzCXDOd7j3jo=
-darvaza.org/core v0.9.7/go.mod h1:4zYtG5ArBmdZ1n7Gw6e6ZwkEQiPFWIYjsQfSmTYCTMc=
-darvaza.org/slog v0.5.3 h1:sQzmZXgqRh9oFMKBwEYrEpucLvKJVZxaxa2bHIA6GJ0=
-darvaza.org/slog v0.5.3/go.mod h1:59d+yi+C7gn4pDDuwbbOKawERpdXthFFk1Yc+Sv6XB0=
+darvaza.org/core v0.9.9 h1:nUNvkGJzWUEQcFSCMjZU8L+yQml8OPWGg7xh7MlSpM4=
+darvaza.org/core v0.9.9/go.mod h1:5YJ2YovkxdjgXd7xMGbg4/cBf0i8Y2Qv80twxl1yf4s=
+darvaza.org/slog v0.5.4 h1:xzlWVzYh4tuZLnj4A9tOHXfn/SAEIkApXPvK3YDiW9g=
+darvaza.org/slog v0.5.4/go.mod h1:QFtY3QoQ7xxww85umlEKPcMCNzqNrHYqnj53KehsmBU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -22,11 +22,15 @@ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
 golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=

diff --git a/x/memcache/go.mod b/x/memcache/go.mod
@@ -11,7 +11,7 @@ require (
  darvaza.org/cache v0.2.2
  darvaza.org/cache/x/simplelru v0.1.3
  darvaza.org/core v0.9.9
- darvaza.org/slog v0.5.3
+ darvaza.org/slog v0.5.4
 )
 
 require (

diff --git a/x/memcache/go.sum b/x/memcache/go.sum
@@ -1,7 +1,7 @@
 darvaza.org/core v0.9.9 h1:nUNvkGJzWUEQcFSCMjZU8L+yQml8OPWGg7xh7MlSpM4=
 darvaza.org/core v0.9.9/go.mod h1:5YJ2YovkxdjgXd7xMGbg4/cBf0i8Y2Qv80twxl1yf4s=
-darvaza.org/slog v0.5.3 h1:sQzmZXgqRh9oFMKBwEYrEpucLvKJVZxaxa2bHIA6GJ0=
-darvaza.org/slog v0.5.3/go.mod h1:59d+yi+C7gn4pDDuwbbOKawERpdXthFFk1Yc+Sv6XB0=
+darvaza.org/slog v0.5.4 h1:xzlWVzYh4tuZLnj4A9tOHXfn/SAEIkApXPvK3YDiW9g=
+darvaza.org/slog v0.5.4/go.mod h1:QFtY3QoQ7xxww85umlEKPcMCNzqNrHYqnj53KehsmBU=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
 golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
 golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=

diff --git a/x/protosink/go.mod b/x/protosink/go.mod
@@ -10,10 +10,9 @@ require (
 )
 
 require (
- darvaza.org/core v0.9.7 // indirect
- darvaza.org/slog v0.5.3 // indirect
+ darvaza.org/core v0.9.9 // indirect
+ darvaza.org/slog v0.5.4 // indirect
  github.com/google/go-cmp v0.5.9 // indirect
- golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
  golang.org/x/net v0.15.0 // indirect
  golang.org/x/text v0.13.0 // indirect
 )
diff --git a/x/protosink/go.sum b/x/protosink/go.sum
@@ -1,14 +1,16 @@
-darvaza.org/core v0.9.7 h1:06htj8yzZ5xIrcYpmjdPBmTg1+y1oHbpzCXDOd7j3jo=
-darvaza.org/core v0.9.7/go.mod h1:4zYtG5ArBmdZ1n7Gw6e6ZwkEQiPFWIYjsQfSmTYCTMc=
-darvaza.org/slog v0.5.3 h1:sQzmZXgqRh9oFMKBwEYrEpucLvKJVZxaxa2bHIA6GJ0=
-darvaza.org/slog v0.5.3/go.mod h1:59d+yi+C7gn4pDDuwbbOKawERpdXthFFk1Yc+Sv6XB0=
+darvaza.org/core v0.9.9 h1:nUNvkGJzWUEQcFSCMjZU8L+yQml8OPWGg7xh7MlSpM4=
+darvaza.org/core v0.9.9/go.mod h1:5YJ2YovkxdjgXd7xMGbg4/cBf0i8Y2Qv80twxl1yf4s=
+darvaza.org/slog v0.5.4 h1:xzlWVzYh4tuZLnj4A9tOHXfn/SAEIkApXPvK3YDiW9g=
+darvaza.org/slog v0.5.4/go.mod h1:QFtY3QoQ7xxww85umlEKPcMCNzqNrHYqnj53KehsmBU=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
 golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=