Merge pull request #432 from RoaringBitmap/trying_to_fix_module_mess

attempt to fix the mess made by doing a major release
RoaringBitmap · Jun 13, 2024 · a591c54 · a591c54
2 parents 1f811f6 + d8ca154
commit a591c54
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 15 deletions.
diff --git a/.github/workflows/armtests.yml b/.github/workflows/armtests.yml
@@ -16,7 +16,7 @@ jobs:
       with:
         go-version: ${{ matrix.go-version }}
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Test
       run: |
         GOARCH=arm go build

diff --git a/.github/workflows/basictests.yml b/.github/workflows/basictests.yml
@@ -12,11 +12,11 @@ jobs:
     runs-on: ${{ matrix.platform }}
     steps:
     - name: Install Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go-version }}
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Test
       run: |
         go build -tags appengine

diff --git a/.github/workflows/bigendiantests.yml b/.github/workflows/bigendiantests.yml
@@ -12,11 +12,11 @@ jobs:
     runs-on: ${{ matrix.platform }}
     steps:
     - name: Install Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go-version }}
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Test
       run: |
         sudo apt-get update

diff --git a/.github/workflows/legacytests.yml b/.github/workflows/legacytests.yml
@@ -12,11 +12,11 @@ jobs:
     runs-on: ${{ matrix.platform }}
     steps:
     - name: Install Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go-version }}
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Test
       run: |
         GOARCH=386 go build ./roaring64

diff --git a/.github/workflows/macostests.yml b/.github/workflows/macostests.yml
@@ -12,11 +12,11 @@ jobs:
     runs-on: ${{ matrix.platform }}
     steps:
     - name: Install Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go-version }}
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Test
       run: |
         go build -tags appengine

diff --git a/.github/workflows/windowstests.yml b/.github/workflows/windowstests.yml
@@ -12,11 +12,11 @@ jobs:
     runs-on: ${{ matrix.platform }}
     steps:
     - name: Install Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go-version }}
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Test
       run: |
         go build -tags appengine

diff --git a/byte_input_test.go b/byte_input_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/RoaringBitmap/roaring/internal"
+	"github.com/RoaringBitmap/roaring/v2/internal"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

diff --git a/go.mod b/go.mod
@@ -3,6 +3,7 @@ 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,3 +1,5 @@
+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/roaring.go b/roaring.go
@@ -12,7 +12,7 @@ import (
 	"io"
 	"strconv"
 
-	"github.com/RoaringBitmap/roaring/internal"
+	"github.com/RoaringBitmap/roaring/v2/internal"
 	"github.com/bits-and-blooms/bitset"
 )
 

diff --git a/roaring64/roaring64.go b/roaring64/roaring64.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 
 	"github.com/RoaringBitmap/roaring"
-	"github.com/RoaringBitmap/roaring/internal"
+	"github.com/RoaringBitmap/roaring/v2/internal"
 )
 
 const serialCookieNoRunContainer = 12346 // only arrays and bitmaps

diff --git a/roaringarray.go b/roaringarray.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/RoaringBitmap/roaring/internal"
+	"github.com/RoaringBitmap/roaring/v2/internal"
 )
 
 type container interface {