Skip to content

Commit bc62753

Browse files
authored
Use rsconnect v1.7.0 (#1519)
* Revert "Offer to install RCurl if we detect this is missing but needed (#1515)" This reverts commit 1cb10c0.
1 parent 95ec7c8 commit bc62753

File tree

2 files changed

+5
-16
lines changed

2 files changed

+5
-16
lines changed

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: bookdown
22
Type: Package
33
Title: Authoring Books and Technical Documents with R Markdown
4-
Version: 0.46.1
4+
Version: 0.46.2
55
Authors@R: c(
66
person("Yihui", "Xie", role = c("aut", "cre"), email = "xie@yihui.name", comment = c(ORCID = "0000-0003-0645-5666")),
77
person("Christophe", "Dervieux", , "cderv@posit.co", role = c("ctb"),
@@ -76,7 +76,7 @@ Suggests:
7676
curl,
7777
rstudioapi,
7878
miniUI,
79-
rsconnect (>= 1.6.0),
79+
rsconnect (>= 1.7.0),
8080
servr (>= 0.13),
8181
shiny,
8282
tibble,

R/publish.R

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#' You are no longer recommended to publish to bookdown.org.
1111
#' @export
1212
publish_book = function(name = NULL, ...) {
13-
if (!xfun::pkg_available("rsconnect", "1.6.0")) {
14-
stop("Please install/upgrade the 'rsconnect' package (>= 1.6.0) to use this function.")
13+
if (!xfun::pkg_available("rsconnect", "1.7.0")) {
14+
stop("Please install/upgrade the 'rsconnect' package (>= 1.7.0) to use this function.")
1515
}
1616
# delete local records of bookdown.org
1717
accounts = rsconnect::accounts()
@@ -34,19 +34,8 @@ publish_book = function(name = NULL, ...) {
3434
# if no accounts other than shinyapps.io and bookdown.org have been set up on
3535
# this machine, offer to add one for connect.posit.cloud
3636
if (length(setdiff(accounts$server, c('shinyapps.io', 'bookdown.org'))) == 0) {
37-
if (readline('Do you want to connect to connect.posit.cloud? (y/n)') == 'y') {
38-
# due to https://github.com/rstudio/rsconnect/pull/1266 we need to install RCurl for rsconnect <= 1.6.2
39-
if (!xfun::pkg_available("rsconnect", "1.6.3") && !xfun::pkg_available("RCurl")) {
40-
msg = 'The RCurl package is not installed but required for Connect Cloud auth flow.'
41-
if (readline(
42-
paste0(msg, '\nDo you want to install RCurl now? (y/n) ')) == 'y') {
43-
install.packages('RCurl')
44-
} else {
45-
stop(msg, ' Please install the RCurl package. Then run rsconnect::connectCloudUser().')
46-
}
47-
}
37+
if (readline('Do you want to connect to connect.posit.cloud? (y/n)') == 'y')
4838
rsconnect::connectCloudUser()
49-
}
5039
}
5140

5241
# deploy the book

0 commit comments

Comments
 (0)