Skip to content

Commit

Permalink
update version of core packages and update lib/extensions
Browse files Browse the repository at this point in the history
* adaptiveservice to v0.9.20
* yaegi to v0.13.0
  • Loading branch information
Bai-Yingjie committed Jul 11, 2022
1 parent 5bb554c commit 1150d87
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 36 deletions.
11 changes: 8 additions & 3 deletions extension/gen_symbols.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,27 @@ basepkg=`basename $pkg`
../cmd/extract/extract -name extension -tag $basepkg $pkg

file=`echo $pkg | tr ./ _-`.go
mv $file $file.raw
while test $# != 0; do
case $1 in
-fixlog)
sed -i 's/logLogger/log.Logger/' $file
sed -i 's/logLogger/log.Logger/' $file.raw
shift
;;
-extramsg)
extrapkg=$pkg/$basepkg
extrafile=`echo $extrapkg | tr ./ _-`.go
../cmd/extract/extract -name extension -tag ${basepkg}msg $extrapkg
sed -n '/func init/,$p' $extrafile >> $file
sed -n '/func init/,$p' $extrafile >> $file.raw
shift
;;
*)
shift
esac
done

gopls format -w $file
head -n 2 $file.raw > $file
tail -n +2 $file.raw > fmt-$file
gopls format -w fmt-$file
cat fmt-$file >> $file
rm -f $file.raw fmt-$file
56 changes: 35 additions & 21 deletions extension/github_com-godevsig-adaptiveservice.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ module github.com/godevsig/gshellos
go 1.16

require (
github.com/godevsig/adaptiveservice v0.9.18
github.com/godevsig/adaptiveservice v0.9.20
github.com/godevsig/grepo v0.1.0
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/traefik/yaegi v0.11.1
github.com/traefik/yaegi v0.13.0
)

replace github.com/niubaoshu/gotiny => github.com/godevsig/gotiny v0.0.4-0.20210913173728-083dd4b72177

replace github.com/go-echarts/go-echarts/v2 => github.com/godevsig/go-echarts/v2 v2.0.0-20211101104447-e8e4a51bc4fd
replace (
github.com/go-echarts/go-echarts/v2 => github.com/godevsig/go-echarts/v2 v2.0.0-20211101104447-e8e4a51bc4fd
github.com/niubaoshu/gotiny => github.com/godevsig/gotiny v0.0.4-0.20210913173728-083dd4b72177
)
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/godevsig/adaptiveservice v0.9.16/go.mod h1:t/MOA1DVvomK8ltOny8pbb8k1ZBYub6GvnTOs/M6Qkk=
github.com/godevsig/adaptiveservice v0.9.18 h1:3MomE8T6VRg5y+zA3h1fJfugzOaw+FfCQ1qyVnb7Qkw=
github.com/godevsig/adaptiveservice v0.9.18/go.mod h1:t/MOA1DVvomK8ltOny8pbb8k1ZBYub6GvnTOs/M6Qkk=
github.com/godevsig/adaptiveservice v0.9.20 h1:xvfxKTiaqEhRes41/bTEbe1X99/hl5UTBm2CJNv5X8M=
github.com/godevsig/adaptiveservice v0.9.20/go.mod h1:t/MOA1DVvomK8ltOny8pbb8k1ZBYub6GvnTOs/M6Qkk=
github.com/godevsig/go-echarts/v2 v2.0.0-20211101104447-e8e4a51bc4fd h1:NXoy9fdgrEi4dREtTBQMRl5naGeHpYldnqjh5rmZgJk=
github.com/godevsig/go-echarts/v2 v2.0.0-20211101104447-e8e4a51bc4fd/go.mod h1:6TOomEztzGDVDkOSCFBq3ed7xOYfbOqhaBzD0YV771A=
github.com/godevsig/gotiny v0.0.4-0.20210913173728-083dd4b72177 h1:Ga+4dO0xF4ejuZfKnHfEA/bqlNUc2XKNjpopVDhMjLM=
Expand All @@ -31,8 +31,8 @@ github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.6.0 h1:jlIyCplCJFULU/01vCkhKuTyc3OorI3bJFuw6obfgho=
github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/traefik/yaegi v0.11.1 h1:MJpYUnRc/wNOQcdywGd/q2mCznZAiAch1V+Ae+XFVzc=
github.com/traefik/yaegi v0.11.1/go.mod h1:RuCwD8/wsX7b6KoQHOaIFUfuH3gQIK4KWnFFmJMw5VA=
github.com/traefik/yaegi v0.13.0 h1:dNwyGNSLHuRw5xswpbuW1TlzzGDciiK6uAighR1tMsc=
github.com/traefik/yaegi v0.13.0/go.mod h1:RuCwD8/wsX7b6KoQHOaIFUfuH3gQIK4KWnFFmJMw5VA=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
Expand Down
1 change: 1 addition & 0 deletions gshellbuilder.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ func addDeamonCmd() {
}
s := as.NewServer(opts...).
SetPublisher(godevsigPublisher).
SetScaleFactors(4, 32).
EnableServiceLister()
defer s.Close()

Expand Down
11 changes: 8 additions & 3 deletions testdata/repl.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
package main

count := 9
count++
fmt.Println("hello", count, "times")
import "fmt"

func main() {
count := 9
count++
fmt.Println("hello", count, "times")
}

0 comments on commit 1150d87

Please sign in to comment.