Merge branch 'main' of github.com:anytypeio/any-sync into update-fileproto

This commit is contained in:
Sergey Cherepanov 2023-03-06 12:10:28 +03:00
commit a497e129c4
No known key found for this signature in database
GPG Key ID: 87F8EDE8FBDF637C
4 changed files with 14 additions and 10 deletions

View File

@ -1,5 +1,5 @@
//go:build ((!linux && !darwin) || android || ios || nographviz) && !amd64
// +build !linux,!darwin android ios nographviz
//go:build ((!linux && !darwin) || android || ios || nographviz || !cgo) && !amd64
// +build !linux,!darwin android ios nographviz !cgo
// +build !amd64
package acllistbuilder

View File

@ -1,19 +1,21 @@
//go:build (linux || darwin) && !android && !ios && !nographviz && (amd64 || arm64)
//go:build (linux || darwin) && !android && !ios && !nographviz && cgo && (amd64 || arm64)
// +build linux darwin
// +build !android
// +build !ios
// +build !nographviz
// +build cgo
// +build amd64 arm64
package acllistbuilder
import (
"fmt"
"github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto"
"github.com/gogo/protobuf/proto"
"strings"
"unicode"
"github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto"
"github.com/gogo/protobuf/proto"
"github.com/awalterschulze/gographviz"
)

View File

@ -1,5 +1,5 @@
//go:build (!linux && !darwin) || android || ios || nographviz || windows
// +build !linux,!darwin android ios nographviz windows
//go:build (!linux && !darwin) || android || ios || nographviz || !cgo || windows
// +build !linux,!darwin android ios nographviz !cgo windows
package objecttree

View File

@ -1,8 +1,9 @@
//go:build (linux || darwin) && !android && !ios && !nographviz && (amd64 || arm64)
//go:build (linux || darwin) && !android && !ios && !nographviz && cgo && (amd64 || arm64)
// +build linux darwin
// +build !android
// +build !ios
// +build !nographviz
// +build cgo
// +build amd64 arm64
package objecttree
@ -10,10 +11,11 @@ package objecttree
import (
"bytes"
"fmt"
"github.com/goccy/go-graphviz"
"github.com/goccy/go-graphviz/cgraph"
"strings"
"time"
"github.com/goccy/go-graphviz"
"github.com/goccy/go-graphviz/cgraph"
)
func (t *Tree) Graph(parser DescriptionParser) (data string, err error) {