Merge pull request #63 from scr-oath/newer-go

Bumping to newer go (at least 1.16) and using the embed technique instead of needing textFileToGoConst

Author: scr-oath

.github/workflows/ci.yaml

@@ -12,9 +12,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: ['1.14', '1.15', '1.16', '1.17', '1.18', '1.19', '1.20', '1.21']
+        go: [ '1.16', '1.17', '1.18', '1.19', '1.20','1.21' ]
 
-    services: {}
+    services: { }
     steps:
       - name: Set up Go
         uses: actions/setup-go@v2

argparse/loader.go

@@ -1,11 +1,12 @@
 package argparse
 
 import (
+	_ "embed"
 	lua "github.com/yuin/gopher-lua"
 )
 
-// TODO(scr): move to embed once minimum supported go version is 1.16
-//go:generate go run github.com/logrusorgru/textFileToGoConst@latest -in argparse.lua -o lua_const.go -c lua_argparse
+//go:embed argparse.lua
+var lua_argparse string
 
 // Preload adds inspect to the given Lua state's package.preload table. After it
 // has been preloaded, it can be loaded using require:

argparse/lua_const.go

@@ -1,6 +1,6 @@
 module github.com/vadv/gopher-lua-libs
 
-go 1.13
+go 1.16
 
 require (
 	github.com/alessio/shellescape v1.4.1

go.mod

@@ -173,7 +173,6 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 h1:eJv7u3ksNXoLbGSKuv2s/SIO4tJVxc/A+MTpzxDgz/Q=
 golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=

go.sum

@@ -1,12 +1,13 @@
 package inspect
 
-// TODO(scr): move to embed once minimum supported go version is 1.16
-//go:generate go run github.com/logrusorgru/textFileToGoConst@latest -in inspect.lua -o lua_const.go -c lua_inspect
-
 import (
+	_ "embed"
 	lua "github.com/yuin/gopher-lua"
 )
 
+//go:embed inspect.lua
+var lua_inspect string
+
 // Preload adds inspect to the given Lua state's package.preload table. After it
 // has been preloaded, it can be loaded using require:
 //