Skip to content

Commit

Permalink
Update module to v2 (#520)
Browse files Browse the repository at this point in the history
* Update module to v2

Make go mod version consistent with git tag so other
projects can import the livekit-cli module.

* changeset

* changeset
  • Loading branch information
cnderrauber authored Feb 13, 2025
1 parent 1e7c836 commit fc13d04
Show file tree
Hide file tree
Showing 19 changed files with 27 additions and 26 deletions.
1 change: 1 addition & 0 deletions .nanpa/2131758.kdl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
patch type="added" "Update go module to v2"
6 changes: 3 additions & 3 deletions cmd/lk/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"github.com/charmbracelet/huh"
"github.com/charmbracelet/huh/spinner"
"github.com/charmbracelet/lipgloss"
"github.com/livekit/livekit-cli/pkg/bootstrap"
"github.com/livekit/livekit-cli/pkg/config"
"github.com/livekit/livekit-cli/pkg/util"
"github.com/livekit/livekit-cli/v2/pkg/bootstrap"
"github.com/livekit/livekit-cli/v2/pkg/config"
"github.com/livekit/livekit-cli/v2/pkg/util"
"github.com/urfave/cli/v3"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/lk/cloud.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (
"github.com/pkg/browser"
"github.com/urfave/cli/v3"

authutil "github.com/livekit/livekit-cli/pkg/auth"
"github.com/livekit/livekit-cli/pkg/config"
"github.com/livekit/livekit-cli/pkg/util"
authutil "github.com/livekit/livekit-cli/v2/pkg/auth"
"github.com/livekit/livekit-cli/v2/pkg/config"
"github.com/livekit/livekit-cli/v2/pkg/util"
"github.com/livekit/protocol/auth"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/lk/dispatch.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/urfave/cli/v3"

"github.com/livekit/livekit-cli/pkg/util"
"github.com/livekit/livekit-cli/v2/pkg/util"
"github.com/livekit/protocol/livekit"
"github.com/livekit/protocol/utils"
lksdk "github.com/livekit/server-sdk-go/v2"
Expand Down
4 changes: 2 additions & 2 deletions cmd/lk/egress.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import (
"github.com/livekit/protocol/livekit"
lksdk "github.com/livekit/server-sdk-go/v2"

"github.com/livekit/livekit-cli/pkg/loadtester"
"github.com/livekit/livekit-cli/pkg/util"
"github.com/livekit/livekit-cli/v2/pkg/loadtester"
"github.com/livekit/livekit-cli/v2/pkg/util"
)

type egressType string
Expand Down
2 changes: 1 addition & 1 deletion cmd/lk/ingress.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/urfave/cli/v3"

"github.com/livekit/livekit-cli/pkg/util"
"github.com/livekit/livekit-cli/v2/pkg/util"
"github.com/livekit/protocol/livekit"
lksdk "github.com/livekit/server-sdk-go/v2"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/lk/join.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
"github.com/livekit/protocol/logger"
lksdk "github.com/livekit/server-sdk-go/v2"

provider2 "github.com/livekit/livekit-cli/pkg/provider"
provider2 "github.com/livekit/livekit-cli/v2/pkg/provider"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/lk/loadtest.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/go-logr/logr"
"github.com/urfave/cli/v3"

"github.com/livekit/livekit-cli/pkg/loadtester"
"github.com/livekit/livekit-cli/v2/pkg/loadtester"
"github.com/livekit/protocol/logger"
lksdk "github.com/livekit/server-sdk-go/v2"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/lk/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/livekit/protocol/logger"
lksdk "github.com/livekit/server-sdk-go/v2"

livekitcli "github.com/livekit/livekit-cli"
livekitcli "github.com/livekit/livekit-cli/v2"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/lk/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"github.com/charmbracelet/lipgloss/table"
"github.com/urfave/cli/v3"

"github.com/livekit/livekit-cli/pkg/config"
"github.com/livekit/livekit-cli/pkg/util"
"github.com/livekit/livekit-cli/v2/pkg/config"
"github.com/livekit/livekit-cli/v2/pkg/util"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/lk/proto.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto"

"github.com/livekit/livekit-cli/pkg/util"
"github.com/livekit/livekit-cli/v2/pkg/util"
)

const flagRequest = "request"
Expand Down
4 changes: 2 additions & 2 deletions cmd/lk/replay.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"github.com/twitchtv/twirp"
"github.com/urfave/cli/v3"

authutil "github.com/livekit/livekit-cli/pkg/auth"
"github.com/livekit/livekit-cli/pkg/util"
authutil "github.com/livekit/livekit-cli/v2/pkg/auth"
"github.com/livekit/livekit-cli/v2/pkg/util"
"github.com/livekit/protocol/auth"
"github.com/livekit/protocol/replay"
lksdk "github.com/livekit/server-sdk-go/v2"
Expand Down
2 changes: 1 addition & 1 deletion cmd/lk/room.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"github.com/livekit/protocol/logger"
lksdk "github.com/livekit/server-sdk-go/v2"

"github.com/livekit/livekit-cli/pkg/util"
"github.com/livekit/livekit-cli/v2/pkg/util"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/lk/token.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/charmbracelet/huh"
"github.com/urfave/cli/v3"

"github.com/livekit/livekit-cli/pkg/util"
"github.com/livekit/livekit-cli/v2/pkg/util"
"github.com/livekit/protocol/auth"
"github.com/livekit/protocol/livekit"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/lk/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"github.com/twitchtv/twirp"
"github.com/urfave/cli/v3"

"github.com/livekit/livekit-cli/pkg/config"
"github.com/livekit/livekit-cli/pkg/util"
"github.com/livekit/livekit-cli/v2/pkg/config"
"github.com/livekit/livekit-cli/v2/pkg/util"
"github.com/livekit/protocol/utils/interceptors"
)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/livekit/livekit-cli
module github.com/livekit/livekit-cli/v2

go 1.23

Expand Down
2 changes: 1 addition & 1 deletion pkg/bootstrap/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
"github.com/joho/godotenv"
"gopkg.in/yaml.v3"

authutil "github.com/livekit/livekit-cli/pkg/auth"
authutil "github.com/livekit/livekit-cli/v2/pkg/auth"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/loadtester/loadtest.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (

"github.com/charmbracelet/lipgloss"
"github.com/charmbracelet/lipgloss/table"
"github.com/livekit/livekit-cli/pkg/util"
"github.com/livekit/livekit-cli/v2/pkg/util"
"github.com/pkg/errors"
"golang.org/x/sync/errgroup"
"golang.org/x/sync/syncmap"
Expand Down
2 changes: 1 addition & 1 deletion pkg/loadtester/loadtester.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/pion/webrtc/v4"
"go.uber.org/atomic"

provider2 "github.com/livekit/livekit-cli/pkg/provider"
provider2 "github.com/livekit/livekit-cli/v2/pkg/provider"
"github.com/livekit/protocol/livekit"
lksdk "github.com/livekit/server-sdk-go/v2"
"github.com/livekit/server-sdk-go/v2/pkg/samplebuilder"
Expand Down

0 comments on commit fc13d04

Please sign in to comment.