Skip to content

Commit

Permalink
shiny 1.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
vnijs committed Nov 20, 2023
1 parent 473dfef commit 009706d
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 18 deletions.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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", , "[email protected]", c("aut", "cre"))
Description: A platform-independent browser-based interface for business
analytics in R, based on the shiny package. The application combines the
Expand All @@ -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),
Expand Down
28 changes: 13 additions & 15 deletions build/build.R
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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)
)
Expand Down Expand Up @@ -55,18 +55,17 @@ apps <- c(
"radiant"
)

apps <- c("radiant.model")

sapply(apps, rem_old)

dir2set <- file.path(rstudioapi::getActiveProject(), "..")
system(paste0(Sys.which("R"), " -e \"setwd('", dir2set, "'); source('radiant/build/build_mac.R')\""))

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/")
}

Expand Down Expand Up @@ -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()
3 changes: 3 additions & 0 deletions build/build_mac.R
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 009706d

Please sign in to comment.