chore: bump tinygo (0.29.0, 0.30.0, 0.31.1), use go:wasmimport (#61)

Signed-off-by: Edoardo Vacchi <[email protected]>
knqyf263 · Mar 8, 2024 · e2c12f7 · e2c12f7
1 parent b72bd22
commit e2c12f7
Show file tree

Hide file tree

Showing 73 changed files with 82 additions and 94 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -9,7 +9,7 @@ on:
       - 'LICENSE'
   pull_request:
 env:
-  GO_VERSION: "1.18"
+  GO_VERSION: "1.20"
   PROTOC_VERSION: "21.12"
 
 jobs:
@@ -20,9 +20,9 @@ jobs:
       fail-fast: false
       matrix:
         tinygo-version:
-          - "0.26.0"
-          - "0.27.0"
-          - "0.28.1"
+          - "0.31.1"
+          - "0.30.0"
+          - "0.29.0"
 
     steps:
       - uses: actions/checkout@v3

diff --git a/examples/helloworld/greeting/greet.pb.go b/examples/helloworld/greeting/greet.pb.go
diff --git a/examples/helloworld/greeting/greet_host.pb.go b/examples/helloworld/greeting/greet_host.pb.go
diff --git a/examples/helloworld/greeting/greet_options.pb.go b/examples/helloworld/greeting/greet_options.pb.go
diff --git a/examples/helloworld/greeting/greet_plugin.pb.go b/examples/helloworld/greeting/greet_plugin.pb.go
diff --git a/examples/helloworld/greeting/greet_vtproto.pb.go b/examples/helloworld/greeting/greet_vtproto.pb.go
diff --git a/examples/host-function-library/library/json-parser/export/library.pb.go b/examples/host-function-library/library/json-parser/export/library.pb.go
diff --git a/examples/host-function-library/library/json-parser/export/library_host.pb.go b/examples/host-function-library/library/json-parser/export/library_host.pb.go
diff --git a/examples/host-function-library/library/json-parser/export/library_plugin.pb.go b/examples/host-function-library/library/json-parser/export/library_plugin.pb.go
diff --git a/examples/host-function-library/library/json-parser/export/library_vtproto.pb.go b/examples/host-function-library/library/json-parser/export/library_vtproto.pb.go
diff --git a/examples/host-function-library/proto/greet.pb.go b/examples/host-function-library/proto/greet.pb.go
diff --git a/examples/host-function-library/proto/greet_host.pb.go b/examples/host-function-library/proto/greet_host.pb.go
diff --git a/examples/host-function-library/proto/greet_options.pb.go b/examples/host-function-library/proto/greet_options.pb.go
diff --git a/examples/host-function-library/proto/greet_plugin.pb.go b/examples/host-function-library/proto/greet_plugin.pb.go
diff --git a/examples/host-function-library/proto/greet_vtproto.pb.go b/examples/host-function-library/proto/greet_vtproto.pb.go
diff --git a/examples/host-functions/greeting/greet.pb.go b/examples/host-functions/greeting/greet.pb.go
diff --git a/examples/host-functions/greeting/greet_host.pb.go b/examples/host-functions/greeting/greet_host.pb.go
diff --git a/examples/host-functions/greeting/greet_options.pb.go b/examples/host-functions/greeting/greet_options.pb.go
diff --git a/examples/host-functions/greeting/greet_plugin.pb.go b/examples/host-functions/greeting/greet_plugin.pb.go
diff --git a/examples/host-functions/greeting/greet_vtproto.pb.go b/examples/host-functions/greeting/greet_vtproto.pb.go
diff --git a/examples/known-types/known/known.pb.go b/examples/known-types/known/known.pb.go
diff --git a/examples/known-types/known/known_host.pb.go b/examples/known-types/known/known_host.pb.go
diff --git a/examples/known-types/known/known_options.pb.go b/examples/known-types/known/known_options.pb.go
diff --git a/examples/known-types/known/known_plugin.pb.go b/examples/known-types/known/known_plugin.pb.go
diff --git a/examples/known-types/known/known_vtproto.pb.go b/examples/known-types/known/known_vtproto.pb.go
diff --git a/examples/wasi/cat/cat.pb.go b/examples/wasi/cat/cat.pb.go
diff --git a/examples/wasi/cat/cat_host.pb.go b/examples/wasi/cat/cat_host.pb.go
diff --git a/examples/wasi/cat/cat_options.pb.go b/examples/wasi/cat/cat_options.pb.go
diff --git a/examples/wasi/cat/cat_plugin.pb.go b/examples/wasi/cat/cat_plugin.pb.go
diff --git a/examples/wasi/cat/cat_vtproto.pb.go b/examples/wasi/cat/cat_vtproto.pb.go
diff --git a/gen/plugin.go b/gen/plugin.go
@@ -103,9 +103,7 @@ func genHostFunctions(g *protogen.GeneratedFile, f *fileInfo) {
 	for _, method := range f.hostService.Methods {
 		importedName := toSnakeCase(method.GoName)
 		g.P(fmt.Sprintf(`
-		//go:wasm-module %s
-		//export %s
-		//go:linkname _%s
+		//go:wasmimport %s %s
 		func _%s(ptr uint32, size uint32) uint64
 
 		func (h %s) %s(ctx %s, request *%s) (*%s, error) {
@@ -127,7 +125,7 @@ func genHostFunctions(g *protogen.GeneratedFile, f *fileInfo) {
 			}
 			return response, nil
 		}`,
-			f.hostService.Module, importedName, importedName, importedName, structName, method.GoName,
+			f.hostService.Module, importedName, importedName, structName, method.GoName,
 			g.QualifiedGoIdent(contextPackage.Ident("Context")),
 			g.QualifiedGoIdent(method.Input.GoIdent),
 			g.QualifiedGoIdent(method.Output.GoIdent),

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/knqyf263/go-plugin
 
-go 1.18
+go 1.20
 
 require (
 	github.com/planetscale/vtprotobuf v0.4.0

diff --git a/tests/fields/proto/fields.pb.go b/tests/fields/proto/fields.pb.go
diff --git a/tests/fields/proto/fields_host.pb.go b/tests/fields/proto/fields_host.pb.go
diff --git a/tests/fields/proto/fields_options.pb.go b/tests/fields/proto/fields_options.pb.go
diff --git a/tests/fields/proto/fields_plugin.pb.go b/tests/fields/proto/fields_plugin.pb.go
diff --git a/tests/fields/proto/fields_vtproto.pb.go b/tests/fields/proto/fields_vtproto.pb.go