Merge pull request #1 from rstudio/3.5

Bump 3.x to 3.5.0
rstudio · Apr 30, 2020 · 72f16b2 · 72f16b2
2 parents 8ef32c0 + de548da
commit 72f16b2
Show file tree

Hide file tree

Showing 10 changed files with 771 additions and 493 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: jquerylib
 Title: Obtain 'jQuery' as an HTML Dependency Object
-Version: 0.1
+Version: 0.1.1
 Authors@R: c(
     person("Carson", "Sievert", role = c("aut", "cre"), email = "[email protected]", comment = c(ORCID = "0000-0002-4958-2844")),
     person("Joe", "Cheng", role = "aut", email = "[email protected]"),

diff --git a/NEWS.md b/NEWS.md
@@ -0,0 +1,3 @@
+# jquerylib 0.1.1
+
+* `jquery_core(3)` now returns 3.5.0 instead of 3.4.1
diff --git a/R/jquery.R b/R/jquery.R
@@ -25,7 +25,7 @@ jquery_core <- function(major_version = 3, minified = getOption("shiny.minified"
 }
 
 expand_version <- function(major_version) {
-  if (major_version == 3) return("3.4.1")
+  if (major_version == 3) return("3.5.0")
   if (major_version == 2) return("2.2.4")
   if (major_version == 1) return("1.12.4")
   stop("major_version must be 1, 2, or 3.")

diff --git a/README.md b/README.md
@@ -36,12 +36,12 @@ jquerylib::jquery_core(3)
 
     ## List of 10
     ##  $ name      : chr "jquery"
-    ##  $ version   : chr "3.4.1"
+    ##  $ version   : chr "3.5.0"
     ##  $ src       :List of 2
     ##   ..$ href: chr "https://code.jquery.com"
     ##   ..$ file: chr "lib"
     ##  $ meta      : NULL
-    ##  $ script    : chr "jquery-3.4.1.js"
+    ##  $ script    : chr "jquery-3.5.0.js"
     ##  $ stylesheet: NULL
     ##  $ head      : NULL
     ##  $ attachment: NULL

diff --git a/inst/lib/AUTHORS.txt b/inst/lib/AUTHORS.txt
@@ -354,3 +354,4 @@ Pat O'Callaghan <[email protected]>
 JuanMa Ruiz <[email protected]>
 Ahmed.S.ElAfifi <[email protected]>
 Sean Robinson <[email protected]>
+Christian Oliff <[email protected]>
diff --git a/inst/lib/jquery-3.4.1.min.js b/inst/lib/jquery-3.4.1.min.js