From cb0ba496e1a76dc135f1153724a75d263a9f5d75 Mon Sep 17 00:00:00 2001 From: James Pogran Date: Wed, 6 Oct 2021 14:13:57 -0400 Subject: [PATCH] Pin to golang 1.17 This updates the go version used to build the project as well as the //go:build statements to align with go 1.17 build changes. --- .go-version | 2 +- internal/lsp/file_handler_unix_test.go | 1 + internal/pathcmp/path_unix_test.go | 1 + internal/schemas/schemas.go | 1 + internal/schemas/schemas_preloadschema.go | 1 + internal/terraform/datadir/module_manifest_unix_test.go | 1 + internal/terraform/discovery/discovery_unix.go | 1 + internal/uri/uri_unix.go | 1 + internal/uri/uri_unix_test.go | 1 + tools.go | 1 + 10 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.go-version b/.go-version index e71519696..b48f32260 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.16 +1.17 diff --git a/internal/lsp/file_handler_unix_test.go b/internal/lsp/file_handler_unix_test.go index 6a35e4673..d7b718ca7 100644 --- a/internal/lsp/file_handler_unix_test.go +++ b/internal/lsp/file_handler_unix_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package lsp diff --git a/internal/pathcmp/path_unix_test.go b/internal/pathcmp/path_unix_test.go index 04079d247..6b3265b66 100644 --- a/internal/pathcmp/path_unix_test.go +++ b/internal/pathcmp/path_unix_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package pathcmp diff --git a/internal/schemas/schemas.go b/internal/schemas/schemas.go index 8408890e1..e7709d511 100644 --- a/internal/schemas/schemas.go +++ b/internal/schemas/schemas.go @@ -1,3 +1,4 @@ +//go:build !preloadschema // +build !preloadschema package schemas diff --git a/internal/schemas/schemas_preloadschema.go b/internal/schemas/schemas_preloadschema.go index 5071becb0..c99287729 100644 --- a/internal/schemas/schemas_preloadschema.go +++ b/internal/schemas/schemas_preloadschema.go @@ -1,3 +1,4 @@ +//go:build preloadschema // +build preloadschema package schemas diff --git a/internal/terraform/datadir/module_manifest_unix_test.go b/internal/terraform/datadir/module_manifest_unix_test.go index a4b4e25f1..a74d313e7 100644 --- a/internal/terraform/datadir/module_manifest_unix_test.go +++ b/internal/terraform/datadir/module_manifest_unix_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package datadir diff --git a/internal/terraform/discovery/discovery_unix.go b/internal/terraform/discovery/discovery_unix.go index 52e3003f8..d423e4747 100644 --- a/internal/terraform/discovery/discovery_unix.go +++ b/internal/terraform/discovery/discovery_unix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package discovery diff --git a/internal/uri/uri_unix.go b/internal/uri/uri_unix.go index 9c753ddd6..6d20b3940 100644 --- a/internal/uri/uri_unix.go +++ b/internal/uri/uri_unix.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package uri diff --git a/internal/uri/uri_unix_test.go b/internal/uri/uri_unix_test.go index 655e33e6a..17e41f5c6 100644 --- a/internal/uri/uri_unix_test.go +++ b/internal/uri/uri_unix_test.go @@ -1,3 +1,4 @@ +//go:build !windows // +build !windows package uri diff --git a/tools.go b/tools.go index 3bb044cc2..475612459 100644 --- a/tools.go +++ b/tools.go @@ -1,3 +1,4 @@ +//go:build tools // +build tools package main