Update dependencies

juho05 · juho05 · commit be4354362a41 · 2022-06-10T13:35:26.000+02:00
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/code-game-project/codegame-cli-go
 go 1.18
 
 require (
-	github.com/code-game-project/codegame-cli v0.5.0
+	github.com/code-game-project/codegame-cli v0.5.1
 	github.com/spf13/pflag v1.0.5
 )
 
diff --git a/go.sum b/go.sum
@@ -1,13 +1,11 @@
-github.com/AlecAivazis/survey/v2 v2.3.4 h1:pchTU9rsLUSvWEl2Aq9Pv3k0IE2fkqtGxazskAMd9Ng=
-github.com/AlecAivazis/survey/v2 v2.3.4/go.mod h1:hrV6Y/kQCLhIZXGcriDCUBtB3wnN7156gMXJ3+b23xM=
 github.com/AlecAivazis/survey/v2 v2.3.5 h1:A8cYupsAZkjaUmhtTYv3sSqc7LO5mp1XDfqe5E/9wRQ=
 github.com/AlecAivazis/survey/v2 v2.3.5/go.mod h1:4AuI9b7RjAR+G7v9+C4YSlX/YL3K3cWNXgWXOhllqvI=
 github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s=
 github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
 github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls=
 github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E=
-github.com/code-game-project/codegame-cli v0.5.0 h1:1lB0lIy8JcCuOhGpUvoxr/2CaRnGZ7FV3Xpy1t0VOFE=
-github.com/code-game-project/codegame-cli v0.5.0/go.mod h1:EIgSdxiXvcgVuGLmhMgif+jpyPyi4o0xelpMHhRJG0I=
+github.com/code-game-project/codegame-cli v0.5.1 h1:6AoWoEbLQpRCnoCVY1aqSQoTJUF1Z9JW6JIEgFMT1zc=
+github.com/code-game-project/codegame-cli v0.5.1/go.mod h1:EIgSdxiXvcgVuGLmhMgif+jpyPyi4o0xelpMHhRJG0I=
 github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI=
 github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -40,8 +38,6 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68 h1:z8Hj/bl9cOV2grsOpEaQFUaly0JWN3i97mo3jXKJNp0=
 golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY=
diff --git a/new/client/client.go b/new/client/client.go
@@ -48,8 +48,13 @@ func CreateNewClient(projectName, gameName, serverURL, libraryVersion string, ge
 	}
 	cli.Finish()
 
+	cgeVersion, err := util.GetCGEVersion(baseURL(serverURL, isSSL(serverURL)))
+	if err != nil {
+		return err
+	}
+
 	cli.Begin("Creating project template...")
-	err = createGoClientTemplate(projectName, module, gameName, serverURL, libraryURL, generateWrappers)
+	err = createGoClientTemplate(projectName, module, gameName, serverURL, libraryURL, cgeVersion, generateWrappers)
 	if err != nil {
 		return err
 	}
@@ -77,16 +82,11 @@ func CreateNewClient(projectName, gameName, serverURL, libraryVersion string, ge
 	return nil
 }
 
-func createGoClientTemplate(projectName, modulePath, gameName, serverURL, libraryURL string, wrappers bool) error {
+func createGoClientTemplate(projectName, modulePath, gameName, serverURL, libraryURL, cgeVersion string, wrappers bool) error {
 	if !wrappers {
 		return execGoClientMainTemplate(projectName, serverURL, libraryURL)
 	}
 
-	cgeVersion, err := util.GetCGEVersion(baseURL(serverURL, isSSL(serverURL)))
-	if err != nil {
-		return err
-	}
-
 	return execGoClientWrappersTemplate(projectName, modulePath, gameName, serverURL, libraryURL, cgeVersion)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ module github.com/code-game-project/codegame-cli-go`
`3`	`3`	`go 1.18`
`4`	`4`
`5`	`5`	`require (`
`6`		`- github.com/code-game-project/codegame-cli v0.5.0`
	`6`	`+ github.com/code-game-project/codegame-cli v0.5.1`
`7`	`7`	`github.com/spf13/pflag v1.0.5`
`8`	`8`	`)`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,13 @@ func CreateNewClient(projectName, gameName, serverURL, libraryVersion string, ge`
`48`	`48`	`}`
`49`	`49`	`cli.Finish()`
`50`	`50`
	`51`	`+ cgeVersion, err := util.GetCGEVersion(baseURL(serverURL, isSSL(serverURL)))`
	`52`	`+ if err != nil {`
	`53`	`+ return err`
	`54`	`+ }`
	`55`	`+`
`51`	`56`	`cli.Begin("Creating project template...")`
`52`		`- err = createGoClientTemplate(projectName, module, gameName, serverURL, libraryURL, generateWrappers)`
	`57`	`+ err = createGoClientTemplate(projectName, module, gameName, serverURL, libraryURL, cgeVersion, generateWrappers)`
`53`	`58`	`if err != nil {`
`54`	`59`	`return err`
`55`	`60`	`}`
`@@ -77,16 +82,11 @@ func CreateNewClient(projectName, gameName, serverURL, libraryVersion string, ge`
`77`	`82`	`return nil`
`78`	`83`	`}`
`79`	`84`
`80`		`-func createGoClientTemplate(projectName, modulePath, gameName, serverURL, libraryURL string, wrappers bool) error {`
	`85`	`+func createGoClientTemplate(projectName, modulePath, gameName, serverURL, libraryURL, cgeVersion string, wrappers bool) error {`
`81`	`86`	`if !wrappers {`
`82`	`87`	`return execGoClientMainTemplate(projectName, serverURL, libraryURL)`
`83`	`88`	`}`
`84`	`89`
`85`		`- cgeVersion, err := util.GetCGEVersion(baseURL(serverURL, isSSL(serverURL)))`
`86`		`- if err != nil {`
`87`		`- return err`
`88`		`- }`
`89`		`-`
`90`	`90`	`return execGoClientWrappersTemplate(projectName, modulePath, gameName, serverURL, libraryURL, cgeVersion)`
`91`	`91`	`}`
`92`	`92`