Merge pull request #28 from vividvilla/upgrade-deps

Upgrade dependecies and versions.

.github/workflows/test.yml

@@ -1,49 +1,27 @@
-name: tests
+name: Run Tests
 
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+# Triggers the workflow on push or pull request events
+on: [push, pull_request]
 
 jobs:
   test:
     strategy:
-      ## this will contain a matrix of all of the combinations
-      ## we wish to test again:
       matrix:
-        go-version: [1.13.x, 1.14.x, 1.15.x]
-        platform: [ubuntu-latest]
+        go: [ '1.18', '1.19', '1.20', '1.21' ]
 
-    runs-on: ${{ matrix.platform }}
+    runs-on: ubuntu-20.04
 
+    name: Go ${{ matrix.go }} Tests
     steps:
-    # Setup Go
-    - name: Setup Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: ${{ matrix.go-version }}
-
-    ## Checks out the code locally.
-    - name: Checkout code
-      uses: actions/checkout@v2
-
-    # Install all the dependencies
-    - name: Install dependencies
-      run: |
-        go version
-        go get -u golang.org/x/lint/golint
-        go get -v -t -d ./...
-
-    # Run vet & lint on the code
-    - name: Run vet & lint
-      run: |
-        go vet .
-        golint .
-
-    # Run testing on the code
-    - name: Run testing
-      run: |
-        go test -v -cover `go list ./... | grep -v 'examples\|benchmarks'`
+      - uses: actions/checkout@v3
+
+      - name: Setup Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ matrix.go }}
+
+      - name: Run all tests
+        run: go test -v github.com/vividvilla/simplesessions...
+
+      - name: Run Coverage
+        run: go test -v -cover ./...

go.mod

@@ -1,13 +1,5 @@
 module github.com/vividvilla/simplesessions
 
-require (
-	github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
-	github.com/alicebob/miniredis v2.5.0+incompatible
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-redis/redis/v8 v8.5.0
-	github.com/gomodule/redigo v1.8.3 // indirect
-	github.com/stretchr/testify v1.6.1
-	github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da // indirect
-)
+require github.com/stretchr/testify v1.9.0
 
 go 1.14

go.work

@@ -0,0 +1,9 @@
+go 1.18
+
+use (
+	.
+	./stores/goredis
+	./stores/redis
+	./stores/securecookie
+	./stores/memory
+)

stores/goredis/go.mod

@@ -0,0 +1,20 @@
+module github.com/vividvilla/simplesessions/stores/goredis/v9
+
+go 1.18
+
+require (
+	github.com/alicebob/miniredis/v2 v2.32.1
+	github.com/redis/go-redis/v9 v9.5.1
+	github.com/stretchr/testify v1.9.0
+	github.com/vividvilla/simplesessions v0.2.0
+)
+
+require (
+	github.com/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/yuin/gopher-lua v1.1.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

stores/goredis/store.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/go-redis/redis/v8"
+	"github.com/redis/go-redis/v9"
 	"github.com/vividvilla/simplesessions"
 	"github.com/vividvilla/simplesessions/conv"
 )

stores/goredis/store_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/alicebob/miniredis"
-	"github.com/go-redis/redis/v8"
+	"github.com/alicebob/miniredis/v2"
+	"github.com/redis/go-redis/v9"
 	"github.com/stretchr/testify/assert"
 	"github.com/vividvilla/simplesessions"
 )

stores/memory/go.mod

@@ -1,6 +1,14 @@
 module github.com/vividvilla/simplesessions/stores/memory
 
+go 1.18
+
+require (
+	github.com/stretchr/testify v1.9.0
+	github.com/vividvilla/simplesessions v0.2.0
+)
+
 require (
-	github.com/stretchr/testify v1.2.2
-	github.com/vividvilla/simplesessions v0.0.1
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

stores/redis/go.mod

@@ -1,10 +1,18 @@
 module github.com/vividvilla/simplesessions/stores/redis
 
+go 1.18
+
+require (
+	github.com/alicebob/miniredis/v2 v2.32.1
+	github.com/gomodule/redigo v1.9.2
+	github.com/stretchr/testify v1.9.0
+	github.com/vividvilla/simplesessions v0.2.0
+)
+
 require (
-	github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6 // indirect
-	github.com/alicebob/miniredis v0.0.0-20180903194238-a6a1e4126522
-	github.com/gomodule/redigo v2.0.0+incompatible
-	github.com/stretchr/testify v1.2.2
-	github.com/vividvilla/simplesessions v0.0.1
-	github.com/yuin/gopher-lua v0.0.0-20180827083657-b942cacc89fe // indirect
+	github.com/alicebob/gopher-json v0.0.0-20230218143504-906a9b012302 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/yuin/gopher-lua v1.1.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

stores/redis/store_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/vividvilla/simplesessions"
 
-	"github.com/alicebob/miniredis"
+	"github.com/alicebob/miniredis/v2"
 	"github.com/gomodule/redigo/redis"
 	"github.com/stretchr/testify/assert"
 )

stores/securecookie/go.mod

@@ -3,7 +3,7 @@ module github.com/vividvilla/simplesessions/stores/securecookie
 go 1.14
 
 require (
-	github.com/gorilla/securecookie v1.1.1
-	github.com/stretchr/testify v1.2.2
-	github.com/vividvilla/simplesessions v0.0.1
+	github.com/gorilla/securecookie v1.1.2
+	github.com/stretchr/testify v1.9.0
+	github.com/vividvilla/simplesessions v0.2.0
 )