Merge branch 'main' into fix/golang1.23-timers

ipfs · Sep 5, 2024 · 6fe369e · 6fe369e
2 parents 9460372 + 51da02f
commit 6fe369e
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@ The following emojis are used to highlight certain changes:
 
 ### Changed
 
+- updated Go in `go.mod` to 1.22
 - `chunker` refactored to reduce overall memory use by reducing heap fragmentation [#649](https://github.com/ipfs/boxo/pull/649)
 - `gateway` deserialized responses will have `Last-Modified` set to value from optional UnixFS 1.5 modification time field (if present in DAG) and a matching `If-Modified-Since` will return `304 Not Modified` (UnixFS 1.5 files only) [#659](https://github.com/ipfs/boxo/pull/659)
 - `bitswap/server` minor performance improvements in concurrent operations

diff --git a/cmd/boxo-migrate/go.mod b/cmd/boxo-migrate/go.mod
@@ -1,6 +1,6 @@
 module github.com/ipfs/boxo/cmd/boxo-migrate
 
-go 1.21
+go 1.22
 
 require github.com/urfave/cli/v2 v2.25.1
 

diff --git a/cmd/deprecator/go.mod b/cmd/deprecator/go.mod
@@ -1,6 +1,6 @@
 module github.com/ipfs/boxo/cmd/deprecator
 
-go 1.21
+go 1.22
 
 require (
 	github.com/dave/dst v0.27.2

diff --git a/examples/go.mod b/examples/go.mod
@@ -1,6 +1,6 @@
 module github.com/ipfs/boxo/examples
 
-go 1.21
+go 1.22
 
 require (
 	github.com/ipfs/boxo v0.22.0

diff --git a/files/meta_other.go b/files/meta_other.go
@@ -1,5 +1,4 @@
 //go:build !linux && !freebsd && !netbsd && !openbsd && !dragonfly && !windows
-// +build !linux,!freebsd,!netbsd,!openbsd,!dragonfly,!windows
 
 package files
 

diff --git a/files/meta_posix.go b/files/meta_posix.go
@@ -1,5 +1,4 @@
 //go:build linux || freebsd || netbsd || openbsd || dragonfly
-// +build linux freebsd netbsd openbsd dragonfly
 
 package files
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/ipfs/boxo
 
-go 1.21
+go 1.22
 
 require (
 	github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9