Skip to content

Commit b10ddce

Browse files
committed
Imported changes from upstream:
- Removed automatic '--relax' hack for compiles on Atmega2560 MCU arduino/arduino-cli#749 - Fixed skethbook+bootloader hex merger. arduino/arduino-cli#744 - Fixed race condition in legacy i18n.LoggerToCustomStreams arduino/arduino-cli#704 - Fixed path-relativization error when traversing different partitions arduino/arduino-cli#658 - Add macro during lib discovery phase arduino/arduino-cli#633 - legacy: Improved progress report from Compile arduino/arduino-cli#625
1 parent 92b8d06 commit b10ddce

File tree

2 files changed

+230
-41
lines changed

2 files changed

+230
-41
lines changed

Diff for: go.mod

+15-15
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@ module github.com/arduino/arduino-builder
33
go 1.13
44

55
require (
6-
github.com/arduino/arduino-cli v0.0.0-20200508091305-a2adf31f5f56
7-
github.com/arduino/go-paths-helper v1.0.1
8-
github.com/arduino/go-properties-orderedmap v1.0.0
6+
github.com/arduino/arduino-cli v0.0.0-20200612152641-f7a6d63d208a
7+
github.com/arduino/go-paths-helper v1.2.0
8+
github.com/arduino/go-properties-orderedmap v1.2.0
99
github.com/fsnotify/fsnotify v1.4.9 // indirect
10-
github.com/golang/protobuf v1.3.5 // indirect
11-
github.com/h2non/filetype v1.0.12 // indirect
12-
github.com/juju/errors v0.0.0-20190930114154-d42613fe1ab9 // indirect
13-
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
14-
github.com/pelletier/go-toml v1.6.0 // indirect
10+
github.com/golang/protobuf v1.4.2 // indirect
11+
github.com/h2non/filetype v1.1.0 // indirect
12+
github.com/juju/errors v0.0.0-20200330140219-3fe23663418f // indirect
13+
github.com/mitchellh/mapstructure v1.3.2 // indirect
14+
github.com/pelletier/go-toml v1.8.0 // indirect
1515
github.com/pkg/errors v0.9.1
16-
github.com/sirupsen/logrus v1.4.2
16+
github.com/sirupsen/logrus v1.6.0
1717
github.com/spf13/afero v1.2.2 // indirect
1818
github.com/spf13/cast v1.3.1 // indirect
1919
github.com/spf13/jwalterweatherman v1.1.0 // indirect
2020
github.com/spf13/pflag v1.0.5 // indirect
21-
golang.org/x/net v0.0.0-20200301022130-244492dfa37a // indirect
22-
golang.org/x/sys v0.0.0-20200317113312-5766fd39f98d // indirect
23-
google.golang.org/genproto v0.0.0-20200318110522-7735f76e9fa5 // indirect
24-
google.golang.org/grpc v1.28.0 // indirect
25-
gopkg.in/ini.v1 v1.55.0 // indirect
26-
gopkg.in/yaml.v2 v2.2.8 // indirect
21+
github.com/spf13/viper v1.7.0 // indirect
22+
golang.org/x/net v0.0.0-20200602114024-627f9648deb9 // indirect
23+
golang.org/x/sys v0.0.0-20200610111108-226ff32320da // indirect
24+
google.golang.org/genproto v0.0.0-20200611194920-44ba362f84c1 // indirect
25+
google.golang.org/grpc v1.29.1 // indirect
26+
gopkg.in/ini.v1 v1.57.0 // indirect
2727
)

0 commit comments

Comments
 (0)