Skip to content

Commit

Permalink
update libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
olebeck committed Mar 7, 2024
1 parent 2896bb8 commit 14849e2
Show file tree
Hide file tree
Showing 20 changed files with 222 additions and 290 deletions.
6 changes: 0 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,3 @@
[submodule "dragonfly"]
path = dragonfly
url = https://github.com/olebeck/dragonfly.git
[submodule "gio"]
path = gio
url = https://github.com/olebeck/gio.git
[submodule "goleveldb"]
path = goleveldb
url = https://github.com/olebeck/goleveldb
6 changes: 3 additions & 3 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ def clean():
os.remove(f"./cmd/bedrocktool/{file}")

def make_dirs():
os.mkdir("./tmp")
os.mkdir("./builds")
os.mkdir("./updates")
os.makedirs("./tmp", exist_ok=True)
os.makedirs("./builds", exist_ok=True)
os.makedirs("./updates", exist_ok=True)


def build_cli(platform: str, arch: str, env_in: dict[str,str], tags: list[str], ldflags, compiled_path: str):
Expand Down
19 changes: 0 additions & 19 deletions cmd/bedrocktool/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (

"github.com/bedrock-tool/bedrocktool/locale"
"github.com/bedrock-tool/bedrocktool/ui"
"github.com/bedrock-tool/bedrocktool/ui/messages"
"github.com/bedrock-tool/bedrocktool/utils"
"github.com/bedrock-tool/bedrocktool/utils/commands"
"github.com/bedrock-tool/bedrocktool/utils/updater"
Expand Down Expand Up @@ -45,20 +44,6 @@ func selectUI() ui.UI {
return ui
}

func updateCheck(ui ui.UI) {
update, err := updater.UpdateAvailable()
if err != nil {
logrus.Warn(err)
return
}
isNew := update.Version != updater.Version

if isNew {
logrus.Infof(locale.Loc("update_available", locale.Strmap{"Version": update.Version}))
ui.Message(messages.UpdateAvailable{Version: update.Version})
}
}

func main() {
{
f, err := os.Create("bedrocktool.log")
Expand Down Expand Up @@ -128,10 +113,6 @@ func main() {

ui := selectUI()

if !isDebug {
go updateCheck(ui)
}

// exit cleanup
sigs := make(chan os.Signal, 1)
signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
Expand Down
2 changes: 1 addition & 1 deletion dragonfly
Submodule dragonfly updated 2 files
+11 −11 go.mod
+37 −27 go.sum
1 change: 0 additions & 1 deletion gio
Submodule gio deleted from ffd722
71 changes: 34 additions & 37 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,75 +3,72 @@ module github.com/bedrock-tool/bedrocktool
go 1.21

require (
gioui.org v0.4.1
gioui.org v0.5.0
gioui.org/shader v1.0.8
gioui.org/x v0.4.0
gioui.org/x v0.5.0
github.com/OneOfOne/xxhash v1.2.8
github.com/beevik/ntp v1.3.0
github.com/beevik/ntp v1.3.1
github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21
github.com/dblezek/tga v0.0.0-20150626111426-80720cbc1017
github.com/df-mc/dragonfly v0.9.9
github.com/df-mc/dragonfly v0.9.13
github.com/df-mc/goleveldb v1.1.9
github.com/dop251/goja v0.0.0-20231027120936-b396bb4c349d
github.com/dop251/goja v0.0.0-20240220182346-e401ed450204
github.com/fatih/color v1.16.0
github.com/flytam/filenamify v1.2.0
github.com/gioui-plugins/gio-plugins v0.0.0-20230625001848-8f18aae6c91c
github.com/go-gl/mathgl v1.1.0
github.com/google/subcommands v1.2.0
github.com/google/uuid v1.5.0
github.com/google/uuid v1.6.0
github.com/gregwebs/go-recovery v0.3.0
github.com/minio/selfupdate v0.6.0
github.com/nicksnyder/go-i18n/v2 v2.2.2
github.com/nicksnyder/go-i18n/v2 v2.4.0
github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5
github.com/sandertv/go-raknet v1.12.1
github.com/sandertv/gophertunnel v1.33.0
github.com/shirou/gopsutil/v3 v3.23.11
github.com/sandertv/gophertunnel v1.35.0
github.com/shirou/gopsutil/v3 v3.24.2
github.com/sirupsen/logrus v1.9.3
github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a
github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e
github.com/undefinedlabs/go-mpatch v1.0.7
golang.design/x/lockfree v0.0.1
golang.org/x/crypto v0.17.0
golang.org/x/exp v0.0.0-20231127185646-65229373498e
golang.org/x/exp/shiny v0.0.0-20231127185646-65229373498e
golang.org/x/oauth2 v0.15.0
golang.org/x/sys v0.15.0
golang.org/x/term v0.15.0
golang.org/x/crypto v0.21.0
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
golang.org/x/exp/shiny v0.0.0-20240222234643-814bf88cf225
golang.org/x/oauth2 v0.18.0
golang.org/x/sys v0.18.0
golang.org/x/term v0.18.0
golang.org/x/text v0.14.0
gopkg.in/yaml.v3 v3.0.1
)

require (
aead.dev/minisign v0.2.1 // indirect
gioui.org/cpu v0.0.0-20220412190645-f1e9e8c3b1f7 // indirect
aead.dev/minisign v0.2.0 // indirect
gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2 // indirect
git.wow.st/gmp/jni v0.0.0-20210610011705-34026c7e22d0 // indirect
github.com/brentp/intintmap v0.0.0-20190211203843-30dc0ade9af9 // indirect
github.com/changkun/lockfree v0.0.1 // indirect
github.com/df-mc/atomic v1.10.0 // indirect
github.com/df-mc/worldupgrader v1.0.12 // indirect
github.com/dlclark/regexp2 v1.10.0 // indirect
github.com/ftrvxmtrx/tga v0.0.0-20150524081124-bd8e8d5be13a // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/dlclark/regexp2 v1.11.0 // indirect
github.com/go-jose/go-jose/v3 v3.0.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
github.com/go-text/typesetting v0.0.0-20231201171600-344014252a3f // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/go-text/typesetting v0.0.0-20230803102845-24e03d8b5372 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/pprof v0.0.0-20231127191134-f3a68a39ae15 // indirect
github.com/gregwebs/errors v1.20.0 // indirect
github.com/klauspost/compress v1.17.4 // indirect
github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed // indirect
github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
github.com/gregwebs/errors v1.1.0 // indirect
github.com/klauspost/compress v1.17.7 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/muhammadmuzzammil1998/jsonc v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/tklauser/go-sysconf v0.3.13 // indirect
github.com/tklauser/numcpus v0.7.0 // indirect
github.com/yusufpapurcu/wmi v1.2.3 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/segmentio/fasthash v1.0.3 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.uber.org/atomic v1.11.0 // indirect
golang.org/x/image v0.14.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/image v0.15.0 // indirect
golang.org/x/net v0.22.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
)
Loading

0 comments on commit 14849e2

Please sign in to comment.