From 009706d171a8935ac3da4a78960c846ad70c2d45 Mon Sep 17 00:00:00 2001
From: rsm-vnijs <vnijs@ucsd.edu>
Date: Sun, 19 Nov 2023 18:07:55 -0800
Subject: [PATCH] shiny 1.8.0

---
 DESCRIPTION       |  6 +++---
 build/build.R     | 28 +++++++++++++---------------
 build/build_mac.R |  3 +++
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 6e8e027..14c26f3 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: radiant
 Type: Package
 Title: Business Analytics using R and Shiny
-Version: 1.6.0
-Date: 2023-9-6
+Version: 1.6.1
+Date: 2023-11-19
 Authors@R: person("Vincent", "Nijs", , "radiant@rady.ucsd.edu", c("aut", "cre"))
 Description: A platform-independent browser-based interface for business
     analytics in R, based on the shiny package. The application combines the
@@ -16,7 +16,7 @@ Depends:
     radiant.model (>= 1.5.0),
     radiant.multivariate (>= 1.5.0)
 Imports:
-    shiny (>= 1.7.1),
+    shiny (>= 1.8.0),
     import (>= 1.1.0)
 Suggests:
     testthat (>= 2.0.0),
diff --git a/build/build.R b/build/build.R
index 08056dd..43f02e6 100644
--- a/build/build.R
+++ b/build/build.R
@@ -3,14 +3,13 @@ curr <- getwd()
 pkg <- basename(curr)
 
 ## building radiant packages for mac and windows
-dev <- FALSE
-
-if (isTRUE(dev)) {
-  devprompt <- readline(prompt = paste0("Are you sure you want to build a development version y/n: "))
-  if (grepl("[nN]", devprompt)) {
-    stop("Set 'dev' to FALSE")
-  }
-}
+# dev <- FALSE
+# if (isTRUE(dev)) {
+#   devprompt <- readline(prompt = paste0("Are you sure you want to build a development version y/n: "))
+#   if (grepl("[nN]", devprompt)) {
+#     stop("Set 'dev' to FALSE")
+#   }
+# }
 
 ## building package for mac and windows
 rv <- R.Version()
@@ -25,6 +24,7 @@ if (rv < "3.4") {
   dirmac <- fs::path("../minicran/bin/macosx/mavericks/contrib", rv)
 } else if (rv > "3.6") {
   dirmac <- c(
+    fs::path("../minicran/bin/macosx/big-sur-x86_64/contrib", rv),
     fs::path("../minicran/bin/macosx/big-sur-arm64/contrib", rv),
     fs::path("../minicran/bin/macosx/contrib", rv)
   )
@@ -55,6 +55,8 @@ apps <- c(
   "radiant"
 )
 
+apps <- c("radiant.model")
+
 sapply(apps, rem_old)
 
 dir2set <- file.path(rstudioapi::getActiveProject(), "..")
@@ -62,11 +64,8 @@ system(paste0(Sys.which("R"), " -e \"setwd('", dir2set, "'); source('radiant/bui
 
 win <- readline(prompt = "Did you build on Windows? y/n: ")
 if (grepl("[yY]", win)) {
-
   fl <- list.files(pattern = "*.zip", path = "~/Dropbox/r-packages", full.names = TRUE)
-  fl
   for (f in fl) {
-    print(f)
     file.copy(f, "~/gh/")
   }
 
@@ -98,7 +97,6 @@ if (grepl("[yY]", win)) {
   setwd(rstudioapi::getActiveProject())
 }
 
-remove.packages("dplyr")
-radiant.update::radiant.update()
-
-)
+# testing
+# remove.packages("dplyr")
+# radiant.update::radiant.update()
diff --git a/build/build_mac.R b/build/build_mac.R
index 6be62f4..482f440 100644
--- a/build/build_mac.R
+++ b/build/build_mac.R
@@ -25,6 +25,9 @@ apps <- c(
   "radiant"
 )
 
+apps <- c("radiant.data", "radiant.model")
+
+
 sapply(apps, update_app, mess = "CRAN", git = TRUE, github = TRUE)
 
 ## build for packages ahead of CRAN