Skip to content

Commit

Permalink
fix(deps): bump supported Go versions to 1.22 and 1.21 (#127)
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Mar 27, 2024
1 parent da3c5f7 commit d026f6a
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/variables/go-versions.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
latest=1.19
penultimate=1.18
latest=1.22
penultimate=1.21
4 changes: 0 additions & 4 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ run:
linters:
enable:
- bodyclose
- deadcode
- depguard
- dupl
- errcheck
- exportloopref
Expand Down Expand Up @@ -36,7 +34,6 @@ linters:
- unconvert
- unparam
- unused
- varcheck
- whitespace
fast: false

Expand All @@ -54,4 +51,3 @@ linters-settings:
issues:
exclude-use-default: false
max-same-issues: 1000
max-per-linter: 1000
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

GOLANGCI_LINT_VERSION=v1.48.0
GOLANGCI_LINT_VERSION=v1.57.1

LINTER=./bin/golangci-lint
LINTER_VERSION_FILE=./bin/.golangci-lint-version-$(GOLANGCI_LINT_VERSION)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

## Supported Go versions

This version of the LaunchDarkly SDK supports Go version 1.18 or higher.
This version of the LaunchDarkly SDK supports Go version 1.21 or higher.

The policy for this SDK follows that of the official Go [Release Policy](https://go.dev/doc/devel/release): each major Go release is supported until there
are two newer major releases.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/launchdarkly/go-server-sdk/v6

go 1.18
go 1.21

require (
github.com/fsnotify/fsnotify v1.4.7
Expand Down
3 changes: 3 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFF
github.com/karlseguin/expect v1.0.2-0.20190806010014-778a5f0c6003 h1:vJ0Snvo+SLMY72r5J4sEfkuE7AFbixEP2qRbEcum/wA=
github.com/karlseguin/expect v1.0.2-0.20190806010014-778a5f0c6003/go.mod h1:zNBxMY8P21owkeogJELCLeHIt+voOSduHYTFUbwRAV8=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/launchdarkly/ccache v1.1.0 h1:voD1M+ZJXR3MREOKtBwgTF9hYHl1jg+vFKS/+VAkR2k=
github.com/launchdarkly/ccache v1.1.0/go.mod h1:TlxzrlnzvYeXiLHmesMuvoZetu4Z97cV1SsdqqBJi1Q=
github.com/launchdarkly/eventsource v1.6.2 h1:5SbcIqzUomn+/zmJDrkb4LYw7ryoKFzH/0TbR0/3Bdg=
Expand Down Expand Up @@ -67,6 +69,7 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/ghodss/yaml.v1 v1.0.0 h1:JlY4R6oVz+ZSvcDhVfNQ/k/8Xo6yb2s1PBhslPZPX4c=
gopkg.in/ghodss/yaml.v1 v1.0.0/go.mod h1:HDvRMPQLqycKPs9nWLuzZWxsxRzISLCRORiDpBUOMqg=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
Expand Down
6 changes: 3 additions & 3 deletions internal/endpoints/configure_endpoints.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
type ServiceType int

const (
StreamingService ServiceType = iota //nolint:revive // don't really need doc comments here
PollingService ServiceType = iota
EventsService ServiceType = iota
StreamingService ServiceType = iota //nolint:revive // internal constant
PollingService ServiceType = iota //nolint:revive // internal constant
EventsService ServiceType = iota //nolint:revive // internal constant
)

func (s ServiceType) String() string {
Expand Down
3 changes: 3 additions & 0 deletions internal/sharedtest/mocks/mock_components.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ type SingleComponentConfigurer[T any] struct {
Instance T
}

// Build builds the component.
func (c SingleComponentConfigurer[T]) Build(clientContext subsystems.ClientContext) (T, error) {
return c.Instance, nil
}
Expand All @@ -18,6 +19,7 @@ type ComponentConfigurerThatReturnsError[T any] struct {
Err error
}

// Build builds the component.
func (c ComponentConfigurerThatReturnsError[T]) Build(clientContext subsystems.ClientContext) (T, error) {
var empty T
return empty, c.Err
Expand All @@ -30,6 +32,7 @@ type ComponentConfigurerThatCapturesClientContext[T any] struct {
ReceivedClientContext subsystems.ClientContext
}

// Build builds the component.
func (c *ComponentConfigurerThatCapturesClientContext[T]) Build(clientContext subsystems.ClientContext) (T, error) {
c.ReceivedClientContext = clientContext
return c.Configurer.Build(clientContext)
Expand Down
2 changes: 1 addition & 1 deletion testservice/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/launchdarkly/go-server-sdk/v6/testservice

go 1.18
go 1.21

require (
github.com/gorilla/mux v1.8.0
Expand Down

0 comments on commit d026f6a

Please sign in to comment.