diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e8efe95..e2e2b9ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this project will be documented in this file. +## [1.12.1] 2020-03-21 + +* add kill_delay [#49](https://github.com/cosmtrek/air/issues/29), credited to [wsnotify](https://github.com/wsnotify) +* build on Go1.14 + ## [1.12.0] 2020-01-01 * add stop_on_error [#38](https://github.com/cosmtrek/air/issues/38) diff --git a/bin/darwin/air b/bin/darwin/air index f28081ac..77b69f67 100755 Binary files a/bin/darwin/air and b/bin/darwin/air differ diff --git a/bin/linux/air b/bin/linux/air index 64a2cfe3..697a622e 100755 Binary files a/bin/linux/air and b/bin/linux/air differ diff --git a/bin/windows/air.exe b/bin/windows/air.exe index 57bc3a3d..a76c68a6 100755 Binary files a/bin/windows/air.exe and b/bin/windows/air.exe differ diff --git a/docs/air.png b/docs/air.png index 7e8e98a1..9bbce1e8 100644 Binary files a/docs/air.png and b/docs/air.png differ diff --git a/go.mod b/go.mod index 53fbb858..15f27dfb 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.13 require ( github.com/creack/pty v1.1.9 github.com/fatih/color v1.7.0 - github.com/fsnotify/fsnotify v1.4.7 + github.com/fsnotify/fsnotify v1.4.9 github.com/imdario/mergo v0.3.8 github.com/mattn/go-colorable v0.1.4 // indirect github.com/mattn/go-isatty v0.0.10 // indirect diff --git a/go.sum b/go.sum index f5e9570d..83143d6f 100644 --- a/go.sum +++ b/go.sum @@ -7,8 +7,8 @@ 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/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= @@ -24,6 +24,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191110163157-d32e6e3b99c4 h1:Hynbrlo6LbYI3H1IqXpkVDOcX/3HiPdhVEuyj5a59RM= golang.org/x/sys v0.0.0-20191110163157-d32e6e3b99c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/main.go b/main.go index 1d737893..748a68f9 100644 --- a/main.go +++ b/main.go @@ -28,9 +28,9 @@ func main() { fmt.Printf(` __ _ ___ / /\ | | | |_) -/_/--\ |_| |_| \_ // live reload for Go apps [v%s] +/_/--\ |_| |_| \_ v%s // live reload for Go apps, with Go%s -`, version) +`, airVersion, goVersion) if showVersion { return diff --git a/version.go b/version.go index 2963d5cb..8c6c2676 100644 --- a/version.go +++ b/version.go @@ -1,3 +1,6 @@ package main -const version = "1.12.0" +const ( + airVersion = "1.12.1" + goVersion = "1.14.0" +)