Skip to content

Commit

Permalink
feat: bump kpm version from 0.2.5 to 0.3.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
zong-zhe committed Jul 14, 2023
1 parent 510e59b commit 3e7bdd9
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 15 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/otiai10/copy v1.9.0
github.com/urfave/cli/v2 v2.25.0
gotest.tools/v3 v3.4.0
kusionstack.io/kclvm-go v0.5.0-beta.1
kcl-lang.io/kcl-go v0.5.0
)

require (
Expand Down Expand Up @@ -81,7 +81,7 @@ require (
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
kcl-lang.io/kcl-artifact-go v0.5.0-beta.1 // indirect
kcl-lang.io/kcl-artifact-go v0.5.0 // indirect
)

require (
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -742,10 +742,10 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
kcl-lang.io/kcl-artifact-go v0.5.0-beta.1 h1:HGjgH3/+2okgzIxsUC8+yq0LhrUj2h7nk/nz6QKp6N4=
kcl-lang.io/kcl-artifact-go v0.5.0-beta.1/go.mod h1:c07mqi9Hu2UjPW7lYfHhAAWOlZiB7lo7Vkr4jL5ov/M=
kusionstack.io/kclvm-go v0.5.0-beta.1 h1:cSmRsC3aHYSJIAADLFI54Yj81c5kr+dMgMYDNxOYOc0=
kusionstack.io/kclvm-go v0.5.0-beta.1/go.mod h1:EvElbVpQ4q1/nVeJst9WOet/zRcMI1uZF+Gzf4Xdin0=
kcl-lang.io/kcl-artifact-go v0.5.0 h1:zaIUamQjdrW+imLZCnrl7g2QuhCNuYCCvoPFFkikgLM=
kcl-lang.io/kcl-artifact-go v0.5.0/go.mod h1:c07mqi9Hu2UjPW7lYfHhAAWOlZiB7lo7Vkr4jL5ov/M=
kcl-lang.io/kcl-go v0.5.0 h1:t9gBcUDQoEa894l0xZ7wKFoC4Nj3EOLvEb4mSiPN0EM=
kcl-lang.io/kcl-go v0.5.0/go.mod h1:gdDthKp2sx6LWfTuIcw50K1RTOQhzBtFGz6dMO7R25Q=
oras.land/oras-go v1.2.3 h1:v8PJl+gEAntI1pJ/LCrDgsuk+1PKVavVEPsYIHFE5uY=
oras.land/oras-go v1.2.3/go.mod h1:M/uaPdYklze0Vf3AakfarnpoEckvw0ESbRdN8Z1vdJg=
oras.land/oras-go/v2 v2.0.2 h1:3aSQdJ7EUC0ft2e9PjJB9Jzastz5ojPA4LzZ3Q4YbUc=
Expand Down
2 changes: 1 addition & 1 deletion pkg/mod/modfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import (
"path/filepath"

"github.com/BurntSushi/toml"
"kcl-lang.io/kcl-go/pkg/kcl"
"kcl-lang.io/kpm/pkg/errors"
"kcl-lang.io/kpm/pkg/git"
"kcl-lang.io/kpm/pkg/oci"
"kcl-lang.io/kpm/pkg/opt"
"kcl-lang.io/kpm/pkg/reporter"
"kcl-lang.io/kpm/pkg/settings"
"kcl-lang.io/kpm/pkg/utils"
"kusionstack.io/kclvm-go/pkg/kcl"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/package/package.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"strings"

"github.com/otiai10/copy"
"kcl-lang.io/kcl-go/pkg/kcl"
"kcl-lang.io/kpm/pkg/env"
errors "kcl-lang.io/kpm/pkg/errors"
modfile "kcl-lang.io/kpm/pkg/mod"
Expand All @@ -16,7 +17,6 @@ import (
"kcl-lang.io/kpm/pkg/runner"
"kcl-lang.io/kpm/pkg/settings"
"kcl-lang.io/kpm/pkg/utils"
"kusionstack.io/kclvm-go/pkg/kcl"
)

type KclPkg struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/runner/args.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package runner

import (
"github.com/alexflint/go-arg"
"kusionstack.io/kclvm-go/pkg/kcl"
"kusionstack.io/kclvm-go/pkg/spec/gpyrpc"
"kcl-lang.io/kcl-go/pkg/kcl"
"kcl-lang.io/kcl-go/pkg/spec/gpyrpc"
)

type Flag struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/runner/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"kusionstack.io/kclvm-go/pkg/kcl"
"kcl-lang.io/kcl-go/pkg/kcl"
)

// The pattern of the external package argument.
Expand Down
2 changes: 1 addition & 1 deletion pkg/runner/runner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"kusionstack.io/kclvm-go/pkg/kcl"
"kcl-lang.io/kcl-go/pkg/kcl"
)

func TestKclRun(t *testing.T) {
Expand Down
5 changes: 3 additions & 2 deletions pkg/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ func (kvt KpmVersionType) String() string {

// All the kpm versions.
const (
KpmAbiVersion KpmVersionType = KpmAbiVersion_0_2_6
KpmVersionType_latest = KpmAbiVersion_0_2_6
KpmAbiVersion KpmVersionType = KpmAbiVersion_0_3_0
KpmVersionType_latest = KpmAbiVersion_0_3_0

KpmAbiVersion_0_3_0 KpmVersionType = "0.3.0"
KpmAbiVersion_0_2_6 KpmVersionType = "0.2.6"
KpmAbiVersion_0_2_5 KpmVersionType = "0.2.5"
KpmAbiVersion_0_2_4 KpmVersionType = "0.2.4"
Expand Down
2 changes: 1 addition & 1 deletion pkg/version/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ func TestGetVersionInStr(t *testing.T) {
}{
{
name: "test get version in string",
want: "0.2.6",
want: "0.3.0",
},
}
for _, tt := range tests {
Expand Down

0 comments on commit 3e7bdd9

Please sign in to comment.