Merge pull request #433 from RoaringBitmap/clean_major_version_update

more fixes having to do with the major version update
RoaringBitmap · Jun 13, 2024 · 7b8e1c3 · 7b8e1c3
2 parents a591c54 + 6b0bdee
commit 7b8e1c3
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 15 deletions.
diff --git a/BitSliceIndexing/bsi.go b/BitSliceIndexing/bsi.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/RoaringBitmap/roaring"
+	"github.com/RoaringBitmap/roaring/v2"
 )
 
 const (

diff --git a/BitSliceIndexing/bsi_test.go b/BitSliceIndexing/bsi_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/RoaringBitmap/roaring"
+	"github.com/RoaringBitmap/roaring/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

diff --git a/README.md b/README.md
@@ -188,7 +188,7 @@ package main
 
 import (
     "fmt"
-    "github.com/RoaringBitmap/roaring"
+    "github.com/RoaringBitmap/roaring/v2"
     "bytes"
 )
 
@@ -285,7 +285,7 @@ package main
 
 import (
     "fmt"
-    "github.com/RoaringBitmap/roaring/roaring64"
+    "github.com/RoaringBitmap/roaring/v2/roaring64"
     "bytes"
 )
 

diff --git a/go.mod b/go.mod
@@ -3,7 +3,6 @@ module github.com/RoaringBitmap/roaring/v2
 go 1.14
 
 require (
-	github.com/RoaringBitmap/roaring v1.9.4
 	github.com/bits-and-blooms/bitset v1.12.0
 	github.com/mschoch/smat v0.2.0
 	github.com/stretchr/testify v1.7.0

diff --git a/go.sum b/go.sum
@@ -1,5 +1,3 @@
-github.com/RoaringBitmap/roaring v1.9.4 h1:yhEIoH4YezLYT04s1nHehNO64EKFTop/wBhxv2QzDdQ=
-github.com/RoaringBitmap/roaring v1.9.4/go.mod h1:6AXUsoIEzDTFFQCe1RbGA6uFONMhvejWj5rqITANK90=
 github.com/bits-and-blooms/bitset v1.12.0 h1:U/q1fAF7xXRhFCrhROzIfffYnu+dlS38vCZtmFVPHmA=
 github.com/bits-and-blooms/bitset v1.12.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=

diff --git a/optimize_test.go b/optimize_test.go
@@ -1,7 +1,7 @@
 package roaring_test
 
 import (
-	"github.com/RoaringBitmap/roaring"
+	"github.com/RoaringBitmap/roaring/v2"
 	"testing"
 )
 

diff --git a/roaring64/iterables64.go b/roaring64/iterables64.go
@@ -1,7 +1,7 @@
 package roaring64
 
 import (
-	"github.com/RoaringBitmap/roaring"
+	"github.com/RoaringBitmap/roaring/v2"
 )
 
 // IntIterable64 allows you to iterate over the values in a Bitmap

diff --git a/roaring64/iterables64_test.go b/roaring64/iterables64_test.go
@@ -4,7 +4,7 @@ import (
 	"math"
 	"testing"
 
-	"github.com/RoaringBitmap/roaring"
+	"github.com/RoaringBitmap/roaring/v2"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/roaring64/parallel64.go b/roaring64/parallel64.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"runtime"
 
-	"github.com/RoaringBitmap/roaring"
+	"github.com/RoaringBitmap/roaring/v2"
 )
 
 var defaultWorkerCount = runtime.NumCPU()

diff --git a/roaring64/roaring64.go b/roaring64/roaring64.go
@@ -8,7 +8,7 @@ import (
 	"io"
 	"strconv"
 
-	"github.com/RoaringBitmap/roaring"
+	"github.com/RoaringBitmap/roaring/v2"
 	"github.com/RoaringBitmap/roaring/v2/internal"
 )
 

diff --git a/roaring64/roaring64_test.go b/roaring64/roaring64_test.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/RoaringBitmap/roaring"
+	"github.com/RoaringBitmap/roaring/v2"
 	"github.com/bits-and-blooms/bitset"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/roaring64/roaringarray64.go b/roaring64/roaringarray64.go
@@ -1,7 +1,7 @@
 package roaring64
 
 import (
-	"github.com/RoaringBitmap/roaring"
+	"github.com/RoaringBitmap/roaring/v2"
 )
 
 type roaringArray64 struct {

diff --git a/roaring64/util.go b/roaring64/util.go
@@ -1,6 +1,6 @@
 package roaring64
 
-import "github.com/RoaringBitmap/roaring"
+import "github.com/RoaringBitmap/roaring/v2"
 
 func highbits(x uint64) uint32 {
 	return uint32(x >> 32)