Merge branch 'master' into improvement/headers

# Conflicts:
#	internal/cadence/vscode/gen.go
#	internal/cadence/vscode/vscode.go

Author: Gregor Gololicic

.github/workflows/cd.yml

@@ -13,7 +13,7 @@ jobs:
         continue-on-error: true
         uses: snyk/actions/golang@master
         with:
-          go-version: '1.16.2'
+          go-version: '1.17'
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
   build:
@@ -24,7 +24,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v1
         with:
-          go-version: '1.16.2'
+          go-version: '1.17'
       - name: Build Binaries
         run: make versioned-binaries
       - name: Uploading Binaries

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-go@v1
       with:
-        go-version: '1.16.2'
+        go-version: '1.17'
     - uses: actions/cache@v1
       with:
         path: ~/go/pkg/mod

go.mod

@@ -1,26 +1,27 @@
 module github.com/onflow/flow-cli
 
-go 1.13
+go 1.16
 
 require (
-	github.com/a8m/envsubst v1.2.0
-	github.com/getsentry/sentry-go v0.12.0
+	github.com/a8m/envsubst v1.3.0
+	github.com/getsentry/sentry-go v0.13.0
 	github.com/go-git/go-git/v5 v5.4.2
 	github.com/gosuri/uilive v0.0.4
 	github.com/joho/godotenv v1.4.0
 	github.com/manifoldco/promptui v0.9.0
-	github.com/onflow/cadence v0.23.0
+	github.com/onflow/cadence v0.23.3
 	github.com/onflow/cadence/languageserver v0.18.3-0.20220202133308-207188a51831
-	github.com/onflow/fcl-dev-wallet v0.4.1
-	github.com/onflow/flow-core-contracts/lib/go/templates v0.10.1
-	github.com/onflow/flow-emulator v0.30.0
-	github.com/onflow/flow-go v0.23.2-0.20220304145234-bf10d55c40fa
+	github.com/onflow/fcl-dev-wallet v0.4.2
+	github.com/onflow/flow-core-contracts/lib/go/templates v0.11.0
+	github.com/onflow/flow-emulator v0.31.1
+	github.com/onflow/flow-go v0.25.6
 	github.com/onflow/flow-go-sdk v0.24.0
 	github.com/psiemens/sconfig v0.1.0
-	github.com/spf13/afero v1.8.0
-	github.com/spf13/cobra v1.3.0
-	github.com/stretchr/testify v1.7.1-0.20210824115523-ab6dc3262822
-	github.com/thoas/go-funk v0.7.0
-	gonum.org/v1/gonum v0.9.3
-	google.golang.org/grpc v1.44.0
+	github.com/sirupsen/logrus v1.6.0 // indirect
+	github.com/spf13/afero v1.8.2
+	github.com/spf13/cobra v1.4.0
+	github.com/stretchr/testify v1.7.1
+	github.com/thoas/go-funk v0.9.2
+	gonum.org/v1/gonum v0.11.0
+	google.golang.org/grpc v1.45.0
 )

go.sum

@@ -10,7 +10,7 @@ VERSION="$1"
 ARCH=""
 
 # Get the architecture (CPU, OS) of the current system as a string.
-# Only MacOS/x86_64/ARM64 and Linux/x86_64 architectures are supported.
+# Only MacOS/x86_64/ARM64 and Linux/x86_64/ARM64 architectures are supported.
 get_architecture() {
     _ostype="$(uname -s)"
     _cputype="$(uname -m)"
@@ -38,7 +38,7 @@ get_architecture() {
         x86_64 | x86-64 | x64 | amd64)
             _cputype=x86_64
             ;;
-         arm64)
+         arm64 | aarch64)
             _cputype=arm64
             ;;
         *)

install.sh

@@ -23,7 +23,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/onflow/flow-cli/internal/cadence/languageserver"
-	"github.com/onflow/flow-cli/internal/cadence/vscode"
 )
 
 var Cmd = &cobra.Command{
@@ -40,5 +39,4 @@ var Cmd = &cobra.Command{
 
 func init() {
 	Cmd.AddCommand(languageserver.Cmd)
-	Cmd.AddCommand(vscode.Cmd)
 }

internal/cadence/cadence.go

@@ -1,21 +0,0 @@
-/*
- * Flow CLI
- *
- * Copyright 2019 Dapper Labs, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package vscode
-
-//go:generate go run github.com/kevinburke/go-bindata/go-bindata -o ./cadence_bin.go --nometadata --pkg vscode ./cadence.vsix

internal/cadence/vscode/.gitignore

@@ -1,65 +0,0 @@
-/*
- * Flow CLI
- *
- * Copyright 2019 Dapper Labs, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package vscode
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-
-	"github.com/spf13/cobra"
-
-	"github.com/onflow/flow-cli/pkg/flowkit/util"
-)
-
-const cadenceExt = "cadence.vsix"
-
-var Cmd = &cobra.Command{
-	Use:   "install-vscode-extension",
-	Short: "Install the Cadence Visual Studio Code extension",
-	Run: func(cmd *cobra.Command, args []string) {
-		ext, _ := Asset(cadenceExt)
-
-		// create temporary directory
-		dir, err := ioutil.TempDir("", "vscode-cadence")
-		if err != nil {
-			util.Exit(1, err.Error())
-		}
-
-		// delete temporary directory
-		defer os.RemoveAll(dir)
-
-		tmpCadenceExt := fmt.Sprintf("%s/%s", dir, cadenceExt)
-
-		err = ioutil.WriteFile(tmpCadenceExt, ext, 0644)
-		if err != nil {
-			util.Exit(1, err.Error())
-		}
-
-		// run vscode command to install extension from temporary directory
-		c := exec.Command("code", "--install-extension", tmpCadenceExt)
-		err = c.Run()
-		if err != nil {
-			util.Exit(1, err.Error())
-		}
-
-		fmt.Println("Installed the Cadence Visual Studio Code extension")
-	},
-}