From 09ea1a05b519870bd7d199063dc6ec29aec6dee9 Mon Sep 17 00:00:00 2001
From: Laurence James-Woodley <mr.lawjames@gmail.com>
Date: Sat, 30 Mar 2024 13:25:34 -0400
Subject: [PATCH 1/3] switch to openxlsx

---
 DESCRIPTION | 2 +-
 Dockerfile  | 2 +-
 NAMESPACE   | 2 +-
 R/logging.R | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 7a17f75..b295af3 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -56,7 +56,7 @@ Imports:
     tidyr,
     vctrs,
     jsonlite,
-    writexl
+    openxlsx
 Suggests:
     RSQLite,
     digest,
diff --git a/Dockerfile b/Dockerfile
index 5b0b123..054fd04 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,7 @@ RUN R -e "install.packages(c( \
   'rjson', \
   'sendmailR', \
   'sqldf', \
-  'writexl', \
+  'openxlsx', \
   'kableExtra' \
 ))"
 
diff --git a/NAMESPACE b/NAMESPACE
index 44a7a30..1127fe9 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -61,6 +61,6 @@ export(write_info_log_entry)
 export(write_summary_metrics)
 export(write_to_sql_db)
 importFrom(magrittr,"%>%")
+importFrom(openxlsx,write.xlsx)
 importFrom(rlang,.data)
 importFrom(sendmailR,"sendmail")
-importFrom(writexl,write_xlsx)
diff --git a/R/logging.R b/R/logging.R
index 36679dd..4b0e559 100644
--- a/R/logging.R
+++ b/R/logging.R
@@ -656,7 +656,7 @@ write_info_log_entry <- function(conn, target_db_name, table_written = NULL, df,
 #'
 #' }
 #' @importFrom sendmailR "sendmail"
-#' @importFrom writexl write_xlsx
+#' @importFrom openxlsx write.xlsx
 #' @export
 send_email <-
   function(email_body,
@@ -711,7 +711,7 @@ send_email <-
           if (file_extension == "csv") {
             readr::write_csv(df_to_email[[i]], file_fullpath, ...)
           } else if (file_extension == "xlsx") {
-            writexl::write_xlsx(df_to_email[[i]], file_fullpath, ...)
+            openxlsx::write.xlsx(df_to_email[[i]], file_fullpath, ...)
           } else {
             stop("Unsupported file format. Use 'csv' or 'xlsx'.")
           }

From 91c6b4d78d136f277b9c8b56c3364676f592e054 Mon Sep 17 00:00:00 2001
From: Philip Chase <pbc@ufl.edu>
Date: Tue, 23 Apr 2024 16:35:16 -0400
Subject: [PATCH 2/3] Update run-tests.yaml to use rstudio-ci:4.3.3

---
 .github/workflows/run-tests.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index f1cb221..8faedbb 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: ghcr.io/ctsit/rstudio-ci:4.2.1
+      image: ghcr.io/ctsit/rstudio-ci:4.3.3
 
     env:
       CI: "TRUE"

From 7c237fd0f633ac27da39fc60968c6872988908b0 Mon Sep 17 00:00:00 2001
From: Philip Chase <pbc@ufl.edu>
Date: Tue, 23 Apr 2024 16:47:38 -0400
Subject: [PATCH 3/3] Bump VERSION and update NEWS.md for release 1.22.1

---
 DESCRIPTION | 2 +-
 NEWS.md     | 4 ++++
 VERSION     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index b295af3..4a45026 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: redcapcustodian
 Type: Package
 Title: Data automation for R-centric workflows with a nod towards REDCap
-Version: 1.22.0
+Version: 1.22.1
 Authors@R: c(
   person("Philip", "Chase",
         email = "pbc@ufl.edu",
diff --git a/NEWS.md b/NEWS.md
index 37576b2..121df6e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,7 @@
+# redcapcustodian 1.22.1 (released 2024-04-23)
+- Update run-tests.yaml to use rstudio-ci:4.3.3 (@pbchase, #157)
+- Switch send_mail() to use openxlsx (@ljwoodley, #152, #157)
+
 # redcapcustodian 1.22.0 (released 2024-03-26)
 - Implement hacky fix for tlmgr 2023 being unable to install packages (@ChemiKyle, #156)
 - Fix bug that prevented email_body from being included in email (@ljwoodley, @ChemiKyle, #155)
diff --git a/VERSION b/VERSION
index 57807d6..6245bee 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.22.0
+1.22.1