Merge pull request #134 from FredHutch/up-versions

Upping the versions of proofr and rcromwell

Dockerfile

@@ -6,9 +6,9 @@ RUN R -q -e 'install.packages(c("ellipsis"), repos="https://cran.rstudio.com/")'
 RUN R -q -e 'install.packages(c("shiny"), repos="https://cran.rstudio.com/")'
 RUN R -q -e 'install.packages(c("shinyFeedback", "shinyWidgets", "shinydashboard", "shinydashboardPlus", "ssh", "remotes", "markdown", "lubridate", "jsonlite", "dplyr", "DT", "glue", "httr", "purrr", "RColorBrewer", "rlang", "shinyBS", "shinyjs", "tidyverse", "uuid", "memoise", "rclipboard", "shinyvalidate", "shinylogs", "testhat", "bsicons", "listviewer", "cookies", "RMariaDB", "DBI"), repos="https://cran.r-project.org")'
 
-RUN R -q -e "remotes::install_github('getwilds/proofr@v0.2')"
+RUN R -q -e "remotes::install_github('getwilds/proofr@v0.3.0')"
 
-RUN R -q -e "remotes::install_github('getwilds/rcromwell@v3.2.5')"
+RUN R -q -e "remotes::install_github('getwilds/rcromwell@v3.3.0')"
 
 ADD .my.cnf /root/
 

Makefile

@@ -1,6 +1,6 @@
 RSCRIPT = Rscript --no-init-file
 FILE_TARGET := "${FILE}"
-DEPS := $(shell ${RSCRIPT} -e 'invisible(lapply(c("glue", "cli"), require, character.only = TRUE, quiet = TRUE))' -e 'deps = renv::dependencies(quiet = TRUE)' -e 'uniq_pkgs = sort(unique(deps$$Package))' -e 'uniq_pkgs = uniq_pkgs[!grepl("^proofr$$|^rcromwell$$", uniq_pkgs)]' -e 'cat(c("getwilds/proofr@v0.2", "getwilds/rcromwell@v3.2.5", uniq_pkgs), file="deps.txt", sep="\n")')
+DEPS := $(shell ${RSCRIPT} -e 'invisible(lapply(c("glue", "cli"), require, character.only = TRUE, quiet = TRUE))' -e 'deps = renv::dependencies(quiet = TRUE)' -e 'uniq_pkgs = sort(unique(deps$$Package))' -e 'uniq_pkgs = uniq_pkgs[!grepl("^proofr$$|^rcromwell$$", uniq_pkgs)]' -e 'cat(c("getwilds/proofr@v0.3.0", "getwilds/rcromwell@v3.3.0", uniq_pkgs), file="deps.txt", sep="\n")')
 
 run:
 	${RSCRIPT} -e "options(shiny.autoreload = TRUE)" \

README.md

@@ -15,7 +15,7 @@ You can run this Shiny app locally. First you'll need to install required packag
 (note: run `make pkg_deps_cmd` to update the below code block)
 
 ```r
-pak::pak(c("getwilds/proofr@v0.2", "getwilds/rcromwell@v3.2.5", "dplyr", "DT", "ggplot2", "glue", "httr", "jsonlite", "lubridate", "magrittr", "memoise", "purrr", "rclipboard", "RColorBrewer", "rlang", "shiny", "shinyBS", "shinydashboard", "shinydashboardPlus", "shinyFeedback", "shinyjs", "shinylogs", "shinyvalidate", "shinyWidgets", "testthat", "tibble", "uuid"))
+pak::pak(c("getwilds/proofr@v0.3.0", "getwilds/rcromwell@v3.3.0", "dplyr", "DT", "ggplot2", "glue", "httr", "jsonlite", "lubridate", "magrittr", "memoise", "purrr", "rclipboard", "RColorBrewer", "rlang", "shiny", "shinyBS", "shinydashboard", "shinydashboardPlus", "shinyFeedback", "shinyjs", "shinylogs", "shinyvalidate", "shinyWidgets", "testthat", "tibble", "uuid"))
 ```
 
 And the above yourself in R.