From 45ea22176a043940a91160cc8ef2c615f7b1f0d8 Mon Sep 17 00:00:00 2001
From: Jesse Peterson <jesse.c.peterson@gmail.com>
Date: Wed, 15 Jan 2025 18:25:33 -0800
Subject: [PATCH] switch to micromdm/plist

---
 go.mod                        | 2 +-
 go.sum                        | 4 ++--
 mdm/checkin.go                | 2 +-
 mdm/command.go                | 2 +-
 service/nanomdm/token_test.go | 2 +-
 service/request.go            | 2 +-
 test/e2e/certauth.go          | 2 +-
 test/e2e/device.go            | 2 +-
 test/enrollment/enrollment.go | 2 +-
 test/plist.go                 | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/go.mod b/go.mod
index 94d38db..c1d6745 100644
--- a/go.mod
+++ b/go.mod
@@ -5,9 +5,9 @@ go 1.17
 require (
 	github.com/RobotsAndPencils/buford v0.14.0
 	github.com/go-sql-driver/mysql v1.8.1
-	github.com/groob/plist v0.0.0-20220217120414-63fa881b19a5
 	github.com/lib/pq v1.10.9
 	github.com/micromdm/nanolib v0.2.0
+	github.com/micromdm/plist v0.2.0
 	github.com/smallstep/pkcs7 v0.0.0-20231107075624-be1870d87d13
 	golang.org/x/net v0.29.0
 )
diff --git a/go.sum b/go.sum
index 7b881bd..0495a18 100644
--- a/go.sum
+++ b/go.sum
@@ -8,12 +8,12 @@ github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqw
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/groob/plist v0.0.0-20220217120414-63fa881b19a5 h1:saaSiB25B1wgaxrshQhurfPKUGJ4It3OxNJUy0rdOjU=
-github.com/groob/plist v0.0.0-20220217120414-63fa881b19a5/go.mod h1:itkABA+w2cw7x5nYUS/pLRef6ludkZKOigbROmCTaFw=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/micromdm/nanolib v0.2.0 h1:g5GHQuUpS82WIAB15LyenjF/0/WSUNJMe5XZfCJSXq4=
 github.com/micromdm/nanolib v0.2.0/go.mod h1:FwBKCvvphgYvbdUZ+qw5kay7NHJcg6zPi8W7kXNajmE=
+github.com/micromdm/plist v0.2.0 h1:W/AuDP/0EB1xNhWvoP5qpE14oYeQSE+IaJqoeAU5SJ0=
+github.com/micromdm/plist v0.2.0/go.mod h1:flkfm0od6GzyXBqI28h5sgEyi3iPO28W2t1Zm9LpwWs=
 github.com/peterbourgon/diskv/v3 v3.0.1/go.mod h1:kJ5Ny7vLdARGU3WUuy6uzO6T0nb/2gWcT1JiBvRmb5o=
 github.com/smallstep/pkcs7 v0.0.0-20231107075624-be1870d87d13 h1:qRxEt9ESQhAg1kjmgJ8oyyzlc9zkAjOooe7bcKjKORQ=
 github.com/smallstep/pkcs7 v0.0.0-20231107075624-be1870d87d13/go.mod h1:SoUAr/4M46rZ3WaLstHxGhLEgoYIDRqxQEXLOmOEB0Y=
diff --git a/mdm/checkin.go b/mdm/checkin.go
index 56de939..db7e2bf 100644
--- a/mdm/checkin.go
+++ b/mdm/checkin.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/groob/plist"
+	"github.com/micromdm/plist"
 )
 
 var ErrUnrecognizedMessageType = errors.New("unrecognized MessageType")
diff --git a/mdm/command.go b/mdm/command.go
index 7b2e023..4edde93 100644
--- a/mdm/command.go
+++ b/mdm/command.go
@@ -3,7 +3,7 @@ package mdm
 import (
 	"errors"
 
-	"github.com/groob/plist"
+	"github.com/micromdm/plist"
 )
 
 var (
diff --git a/service/nanomdm/token_test.go b/service/nanomdm/token_test.go
index c211f2a..dd72fce 100644
--- a/service/nanomdm/token_test.go
+++ b/service/nanomdm/token_test.go
@@ -5,9 +5,9 @@ import (
 	"context"
 	"testing"
 
-	"github.com/groob/plist"
 	"github.com/micromdm/nanomdm/mdm"
 	"github.com/micromdm/nanomdm/service"
+	"github.com/micromdm/plist"
 )
 
 func newTokenMDMReq() *mdm.Request {
diff --git a/service/request.go b/service/request.go
index 92e9af7..7517aea 100644
--- a/service/request.go
+++ b/service/request.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/micromdm/nanomdm/mdm"
 
-	"github.com/groob/plist"
+	"github.com/micromdm/plist"
 )
 
 type HTTPStatusError struct {
diff --git a/test/e2e/certauth.go b/test/e2e/certauth.go
index 0b25efa..86c9538 100644
--- a/test/e2e/certauth.go
+++ b/test/e2e/certauth.go
@@ -5,12 +5,12 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/groob/plist"
 	"github.com/micromdm/nanomdm/mdm"
 	"github.com/micromdm/nanomdm/service/certauth"
 	"github.com/micromdm/nanomdm/storage"
 	"github.com/micromdm/nanomdm/test"
 	"github.com/micromdm/nanomdm/test/enrollment"
+	"github.com/micromdm/plist"
 )
 
 func certAuth(t *testing.T, ctx context.Context, store storage.CertAuthStore) {
diff --git a/test/e2e/device.go b/test/e2e/device.go
index 00f723f..1fa2caa 100644
--- a/test/e2e/device.go
+++ b/test/e2e/device.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/groob/plist"
 	"github.com/micromdm/nanomdm/mdm"
 	"github.com/micromdm/nanomdm/test"
 	"github.com/micromdm/nanomdm/test/enrollment"
+	"github.com/micromdm/plist"
 )
 
 // device is a wrapper around our enrollment for ease of use.
diff --git a/test/enrollment/enrollment.go b/test/enrollment/enrollment.go
index 618a913..46b93b9 100644
--- a/test/enrollment/enrollment.go
+++ b/test/enrollment/enrollment.go
@@ -17,7 +17,7 @@ import (
 	"github.com/micromdm/nanomdm/test"
 	"github.com/micromdm/nanomdm/test/protocol"
 
-	"github.com/groob/plist"
+	"github.com/micromdm/plist"
 )
 
 var ErrAlreadyEnrolled = errors.New("already enrolled")
diff --git a/test/plist.go b/test/plist.go
index 8280f6a..e424ae9 100644
--- a/test/plist.go
+++ b/test/plist.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"io"
 
-	"github.com/groob/plist"
+	"github.com/micromdm/plist"
 )
 
 // PlistReader encodes v to XML Plist.