Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump to v2 #81

Merged
merged 2 commits into from
Sep 18, 2024
Merged

Bump to v2 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
267640e
Bump to v2
jribbink Sep 18, 2024
a16ddc7
update imports
jribbink Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flixkit/flix_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package flixkit
import (
"context"

"github.com/onflow/flixkit-go/internal"
"github.com/onflow/flixkit-go/v2/internal"
"github.com/onflow/flowkit/v2/config"
)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/onflow/flixkit-go
module github.com/onflow/flixkit-go/v2

go 1.22

Expand Down
6 changes: 3 additions & 3 deletions internal/fcl_binding_creator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"sort"
"text/template"

"github.com/onflow/flixkit-go/internal/templates"
v1 "github.com/onflow/flixkit-go/internal/v1"
v1_1 "github.com/onflow/flixkit-go/internal/v1_1"
"github.com/onflow/flixkit-go/v2/internal/templates"
v1 "github.com/onflow/flixkit-go/v2/internal/v1"
v1_1 "github.com/onflow/flixkit-go/v2/internal/v1_1"
"github.com/stoewer/go-strcase"
)

Expand Down
6 changes: 3 additions & 3 deletions internal/fcl_binding_creator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

"github.com/stretchr/testify/assert"

"github.com/onflow/flixkit-go/internal/templates"
v1 "github.com/onflow/flixkit-go/internal/v1"
v1_1 "github.com/onflow/flixkit-go/internal/v1_1"
"github.com/onflow/flixkit-go/v2/internal/templates"
v1 "github.com/onflow/flixkit-go/v2/internal/v1"
v1_1 "github.com/onflow/flixkit-go/v2/internal/v1_1"
)

var parsedTemplateTX = &v1.FlowInteractionTemplate{
Expand Down
4 changes: 2 additions & 2 deletions internal/flix_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/onflow/flowkit/v2/config"
"github.com/onflow/flowkit/v2/output"

v1 "github.com/onflow/flixkit-go/internal/v1"
v1_1 "github.com/onflow/flixkit-go/internal/v1_1"
v1 "github.com/onflow/flixkit-go/v2/internal/v1"
v1_1 "github.com/onflow/flixkit-go/v2/internal/v1_1"
)

type FileReader interface {
Expand Down
4 changes: 2 additions & 2 deletions internal/flix_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"github.com/stretchr/testify/assert"

v1 "github.com/onflow/flixkit-go/internal/v1"
"github.com/onflow/flixkit-go/internal/v1_1"
v1 "github.com/onflow/flixkit-go/v2/internal/v1"
"github.com/onflow/flixkit-go/v2/internal/v1_1"
)

var flix_template = `{
Expand Down
2 changes: 1 addition & 1 deletion internal/v1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"regexp"

"github.com/onflow/flixkit-go/internal/contracts"
"github.com/onflow/flixkit-go/v2/internal/contracts"
)

type Network struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/v1_1/generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/onflow/flowkit/v2/output"
"github.com/spf13/afero"

"github.com/onflow/flixkit-go/internal/contracts"
"github.com/onflow/flixkit-go/v2/internal/contracts"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion internal/v1_1/generator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/onflow/flowkit/v2/config"
"github.com/stretchr/testify/assert"

"github.com/onflow/flixkit-go/internal/contracts"
"github.com/onflow/flixkit-go/v2/internal/contracts"
)

func TestHelloScript(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/v1_1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/ethereum/go-ethereum/rlp"
"github.com/onflow/cadence/runtime/ast"
"github.com/onflow/flixkit-go/internal/contracts"
"github.com/onflow/flixkit-go/v2/internal/contracts"
"golang.org/x/crypto/sha3"
)

Expand Down
Loading