drop ggplot2 2.2.1 support (i.e., require most recent CRAN release)

Author: cpsievert

.Rbuildignore

@@ -6,6 +6,7 @@ CONDUCT.md
 CONTRIBUTING.md
 build_site.R
 travis_debug.R
+revdep_email.R
 todo.R
 .github/
 inst/examples/rmd/*.html
@@ -17,3 +18,4 @@ revdep/
 ^LICENSE\.md$
 README.Rmd
 abbvie.R
+^\.httr-oauth$

.gitignore

@@ -6,6 +6,7 @@ Rapp.history
 *.DS_Store
 node_modules/
 build_site.R
+revdep_email.R
 abbvie.R
 todo.R
 inst/examples/rmd/*.html
@@ -15,3 +16,4 @@ Untitled*
 rsconnect/
 revdep/
 travis_debug.R
+.httr-oauth

DESCRIPTION

@@ -22,7 +22,7 @@ URL: https://plot.ly/r, https://cpsievert.github.io/plotly_book/, https://github
 BugReports: https://github.com/ropensci/plotly/issues
 Depends:
     R (>= 3.2.0),
-    ggplot2 (>= 2.2.1)
+    ggplot2 (> 2.2.1)
 Imports:
     tools,
     scales,
@@ -68,8 +68,6 @@ Suggests:
     RSelenium,
     png,
     IRdisplay
-Remotes:
-  tidyverse/ggplot2
 LazyData: true
 RoxygenNote: 6.0.1.9000
 Encoding: UTF-8

R/ggplotly-legacy.R

@@ -211,26 +211,6 @@ gg2list <- function(p, width = NULL, height = NULL,
     )
   }
 
-  # we currently support ggplot2 >= 2.2.1 (see DESCRIPTION)
-  # there are too many naming changes in 2.2.1.9000 to realistically 
-  if (!is_dev_ggplot2()) {
-    message(
-      "We recommend that you use the dev version of ggplot2 with `ggplotly()`\n",
-      "Install it with: `devtools::install_github('tidyverse/ggplot2')`"
-    )
-    if (!identical(dynamicTicks, FALSE)) {
-      warning(
-        "You need the dev version of ggplot2 to use `dynamicTicks`", call. = FALSE
-      )
-    }
-    return(
-      gg2list_legacy(
-        p, width = width, height = height, tooltip = tooltip,
-        layerData = layerData, originalData = originalData, source = source, ...
-      )
-    )
-  }
-  
   # ------------------------------------------------------------------------
   # Our internal version of ggplot2::ggplot_build(). Modified from
   # https://github.com/hadley/ggplot2/blob/0cd0ba/R/plot-build.r#L18-L92
@@ -265,8 +245,7 @@ gg2list <- function(p, width = NULL, height = NULL,
   # save the domain of the group for display in tooltips
   groupDomains <- Map(function(x, y) {
     aes_g <- y$mapping[["group"]] %||% plot$mapping[["group"]]
-    eval_ <- if (is_dev_ggplot2()) rlang::eval_tidy else base::eval
-    tryNULL(eval_(aes_g, x))
+    tryNULL(rlang::eval_tidy(aes_g, x))
   }, data, layers)
 
   # for simple (StatIdentity) geoms, add crosstalk key to aes mapping
@@ -1286,10 +1265,6 @@ rect2shape <- function(rekt = ggplot2::element_rect()) {
   )
 }
 
-is_dev_ggplot2 <- function() {
-  packageVersion("ggplot2") > "2.2.1"
-}
-
 # We need access to internal ggplot2 functions in several places
 # this helps us import functions in a way that R CMD check won't cry about
 ggfun <- function(x) {

R/ggplotly.R

@@ -82,7 +82,6 @@ layers2traces <- function(data, prestats_data, layout, p) {
   # 2. geom_smooth() is really geom_path() + geom_ribbon()
   datz <- list()
   paramz <- list()
-  layout <- if (is_dev_ggplot2()) layout else list(layout = layout)
   for (i in seq_along(data)) {
     # This has to be done in a loop, since some layers are really two layers,
     # (and we need to replicate the data/params in those cases)

R/layers2traces.R

@@ -150,9 +150,7 @@ test_run <- function(...) {
   test_check(...)
 }
 
-if (packageVersion("ggplot2") > "2.2.1") {
-  test_run("plotly")
-}
+test_run("plotly")
 
 # now, actually build the table (if necessary)
 if (build_table) {