uuid from stdlib

Author: firu11

e2e/calendars_test.go

@@ -7,12 +7,12 @@ import (
 	"path/filepath"
 	"testing"
 	"time"
+	"uuid"
 
 	"github.com/git-calendar/core/pkg/core"
 	"github.com/git-calendar/core/pkg/filesystem"
 	gogit "github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/object"
-	"github.com/google/uuid"
 )
 
 const testCalendarName = "test"

e2e/encryption_test.go

@@ -7,10 +7,10 @@ import (
 	"path/filepath"
 	"testing"
 	"time"
+	"uuid"
 
 	"github.com/git-calendar/core/pkg/core"
 	"github.com/git-calendar/core/pkg/filesystem"
-	"github.com/google/uuid"
 	aessiv "github.com/jedisct1/go-aes-siv"
 )
 

e2e/events_basic_test.go

@@ -8,10 +8,10 @@ import (
 	"reflect"
 	"testing"
 	"time"
+	"uuid"
 
 	"github.com/git-calendar/core/pkg/core"
 	"github.com/git-calendar/core/pkg/filesystem"
-	"github.com/google/uuid"
 )
 
 func TestAddEvent_CreatesJsonFile(t *testing.T) {

e2e/events_repeating_test.go

@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"testing"
 	"time"
+	"uuid"
 
 	"github.com/git-calendar/core/pkg/core"
-	"github.com/google/uuid"
 	rrule "github.com/teambition/rrule-go"
 )
 

e2e/ical_import_test.go

@@ -37,8 +37,8 @@ func TestImportICalFilePersistsEvents(t *testing.T) {
 	if len(events) != 1 {
 		t.Fatalf("got %d imported events, want 1", len(events))
 	}
-	if events[0].ID.Version() != 5 {
-		t.Errorf("event ID version = %d, want 5", events[0].ID.Version())
+	if version := events[0].ID[6] >> 4; version != 5 {
+		t.Errorf("event ID version = %d, want 5", version)
 	}
 	id := events[0].ID
 
@@ -275,8 +275,8 @@ func TestImportICalURLCachesUntilSync(t *testing.T) {
 	if len(events) != 1 || events[0].Title != "First title" {
 		t.Fatalf("first URL import = %+v", events)
 	}
-	if events[0].ID.Version() != 5 {
-		t.Errorf("event ID version = %d, want 5", events[0].ID.Version())
+	if version := events[0].ID[6] >> 4; version != 5 {
+		t.Errorf("event ID version = %d, want 5", version)
 	}
 	id := events[0].ID
 

e2e/tags_test.go

@@ -3,9 +3,9 @@ package e2e
 import (
 	"testing"
 	"time"
+	"uuid"
 
 	"github.com/git-calendar/core/pkg/core"
-	"github.com/google/uuid"
 )
 
 func TestTag_CreateTag_CreatesTag(t *testing.T) {
@@ -222,7 +222,7 @@ func TestTag_RemoveTag_UntagsAffectedEvents(t *testing.T) {
 func TestTag_RemoveTag_InvalidIDReturnsError(t *testing.T) {
 	c := newTestCore(t)
 
-	err := c.RemoveTag(testCalendarName, uuid.Nil)
+	err := c.RemoveTag(testCalendarName, uuid.Nil())
 	if err == nil {
 		t.Fatalf("expected invalid tag id error")
 	}

e2e/zip_restore_test.go

@@ -7,9 +7,9 @@ import (
 	"path/filepath"
 	"testing"
 	"time"
+	"uuid"
 
 	"github.com/git-calendar/core/pkg/core"
-	"github.com/google/uuid"
 )
 
 func TestRestoreZipRoundTrip(t *testing.T) {

go.mod

@@ -7,7 +7,6 @@ require (
 	github.com/go-git/go-billy/v5 v5.9.1
 	github.com/go-git/go-git/v5 v5.19.2
 	github.com/google/go-cmp v0.7.0
-	github.com/google/uuid v1.6.0
 	github.com/jedisct1/go-aes-siv v1.0.0
 	github.com/rdleal/intervalst v1.5.0
 	github.com/teambition/rrule-go v1.8.2

go.sum

@@ -38,8 +38,6 @@ github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8J
 github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/jedisct1/go-aes-siv v1.0.0 h1:1LUqYiKEvQhv1Pmwgi5DQMPPFxqT0cWmMPnzCNVYCO8=

pkg/api/api.go

@@ -14,9 +14,9 @@ import (
 	"net/url"
 	"strings"
 	"time"
+	"uuid"
 
 	"github.com/git-calendar/core/pkg/core"
-	"github.com/google/uuid"
 	"github.com/teambition/rrule-go"
 )