Merge branch 'trunk' of github.com:cli/cli into jg/move-codespace-api

cmd/ghcs/logs.go

@@ -6,7 +6,7 @@ import (
 	"net"
 
 	"github.com/cli/cli/v2/internal/codespaces"
-	"github.com/cli/cli/v2/internal/liveshare"
+	"github.com/cli/cli/v2/pkg/liveshare"
 	"github.com/spf13/cobra"
 )
 

cmd/ghcs/ports.go

@@ -14,7 +14,7 @@ import (
 	"github.com/cli/cli/v2/cmd/ghcs/output"
 	"github.com/cli/cli/v2/internal/codespaces"
 	"github.com/cli/cli/v2/internal/codespaces/api"
-	"github.com/cli/cli/v2/internal/liveshare"
+	"github.com/cli/cli/v2/pkg/liveshare"
 	"github.com/muhammadmuzzammil1998/jsonc"
 	"github.com/spf13/cobra"
 	"golang.org/x/sync/errgroup"

cmd/ghcs/ssh.go

@@ -6,7 +6,7 @@ import (
 	"net"
 
 	"github.com/cli/cli/v2/internal/codespaces"
-	"github.com/cli/cli/v2/internal/liveshare"
+	"github.com/cli/cli/v2/pkg/liveshare"
 	"github.com/spf13/cobra"
 )
 

internal/codespaces/codespaces.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/cli/cli/v2/internal/codespaces/api"
-	"github.com/cli/cli/v2/internal/liveshare"
+	"github.com/cli/cli/v2/pkg/liveshare"
 )
 
 type logger interface {

internal/codespaces/states.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/cli/cli/v2/internal/codespaces/api"
-	"github.com/cli/cli/v2/internal/liveshare"
+	"github.com/cli/cli/v2/pkg/liveshare"
 )
 
 // PostCreateStateStatus is a string value representing the different statuses a state can have.

pkg/liveshare/client_test.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	livesharetest "github.com/cli/cli/v2/internal/liveshare/test"
+	livesharetest "github.com/cli/cli/v2/pkg/liveshare/test"
 	"github.com/sourcegraph/jsonrpc2"
 )
 

pkg/liveshare/port_forwarder_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	livesharetest "github.com/cli/cli/v2/internal/liveshare/test"
+	livesharetest "github.com/cli/cli/v2/pkg/liveshare/test"
 	"github.com/sourcegraph/jsonrpc2"
 )
 

pkg/liveshare/session_test.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	livesharetest "github.com/cli/cli/v2/internal/liveshare/test"
+	livesharetest "github.com/cli/cli/v2/pkg/liveshare/test"
 	"github.com/sourcegraph/jsonrpc2"
 )