diff --git a/renv.lock b/renv.lock index 1c9cc63..1c496be 100644 --- a/renv.lock +++ b/renv.lock @@ -1,6 +1,6 @@ { "R": { - "Version": "4.2.1", + "Version": "4.3.3", "Repositories": [ { "Name": "CRAN", @@ -11,7 +11,7 @@ "Packages": { "MASS": { "Package": "MASS", - "Version": "7.3-58.1", + "Version": "7.3-60.0.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -22,15 +22,16 @@ "stats", "utils" ], - "Hash": "762e1804143a332333c054759f89a706" + "Hash": "b765b28387acc8ec9e9c1530713cb19c" }, "Matrix": { "Package": "Matrix", - "Version": "1.5-3", + "Version": "1.6-5", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", + "grDevices", "graphics", "grid", "lattice", @@ -38,7 +39,7 @@ "stats", "utils" ], - "Hash": "4006dffe49958d2dd591c17e61e60591" + "Hash": "8c7115cd3a0e048bda2a7cd110549f7a" }, "R6": { "Package": "R6", @@ -62,34 +63,34 @@ }, "Rcpp": { "Package": "Rcpp", - "Version": "1.0.9", + "Version": "1.0.12", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "methods", "utils" ], - "Hash": "e9c08b94391e9f3f97355841229124f2" + "Hash": "5ea2700d21e038ace58269ecdbeb9ec0" }, "Rttf2pt1": { "Package": "Rttf2pt1", - "Version": "1.3.11", + "Version": "1.3.12", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "60818466bde87943f750b33b5ef5217b" + "Hash": "a60168d094ca7e4de5106d60001c3964" }, "askpass": { "Package": "askpass", - "Version": "1.1", + "Version": "1.2.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "sys" ], - "Hash": "e8a22846fff485f0be3770c2da758713" + "Hash": "cad6cf7f1d5f6e906700b9d3e718c796" }, "base64enc": { "Package": "base64enc", @@ -103,49 +104,51 @@ }, "bslib": { "Package": "bslib", - "Version": "0.4.2", + "Version": "0.7.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "base64enc", "cachem", + "fastmap", "grDevices", "htmltools", "jquerylib", "jsonlite", + "lifecycle", "memoise", "mime", "rlang", "sass" ], - "Hash": "a7fbf03946ad741129dc81098722fca1" + "Hash": "8644cc53f43828f19133548195d7e59e" }, "cachem": { "Package": "cachem", - "Version": "1.0.6", + "Version": "1.0.8", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "fastmap", "rlang" ], - "Hash": "648c5b3d71e6a37e3043617489a0a0e9" + "Hash": "c35768291560ce302c0a6589f92e837d" }, "cli": { "Package": "cli", - "Version": "3.6.0", + "Version": "3.6.2", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "utils" ], - "Hash": "3177a5a16c243adc199ba33117bd9657" + "Hash": "1216ac65ac55ec0058a6f75d7ca0fd52" }, "colorspace": { "Package": "colorspace", - "Version": "2.0-3", + "Version": "2.1-0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -155,25 +158,28 @@ "methods", "stats" ], - "Hash": "bb4341986bc8b914f0f0acf2e4a3f2f7" + "Hash": "f20c47fd52fae58b4e377c37bb8c335b" }, "commonmark": { "Package": "commonmark", - "Version": "1.8.1", + "Version": "1.9.1", "Source": "Repository", - "Repository": "CRAN", - "Hash": "b6e3e947d1d7ebf3d2bdcea1bde63fe7" + "Repository": "RSPM", + "Hash": "5d8225445acb167abf7797de48b2ee3c" }, "cpp11": { "Package": "cpp11", - "Version": "0.4.3", + "Version": "0.4.7", "Source": "Repository", - "Repository": "CRAN", - "Hash": "ed588261931ee3be2c700d22e94a29ab" + "Repository": "RSPM", + "Requirements": [ + "R" + ], + "Hash": "5a295d7d963cc5035284dcdbaf334f4e" }, "credentials": { "Package": "credentials", - "Version": "1.3.2", + "Version": "2.0.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -183,11 +189,11 @@ "openssl", "sys" ], - "Hash": "93762d0a34d78e6a025efdbfb5c6bb41" + "Hash": "c7844b32098dcbd1c59cbd8dddb4ecc6" }, "crosstalk": { "Package": "crosstalk", - "Version": "1.2.0", + "Version": "1.2.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -196,11 +202,11 @@ "jsonlite", "lazyeval" ], - "Hash": "6aa54f69598c32177e920eb3402e8293" + "Hash": "ab12c7b080a57475248a30f4db6298c0" }, "crul": { "Package": "crul", - "Version": "1.3", + "Version": "1.4.2", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -211,51 +217,51 @@ "mime", "urltools" ], - "Hash": "2408d291bf25a9a6c27d912bcfe6ce0c" + "Hash": "5685d2603020d0f879a147ba23d51292" }, "curl": { "Package": "curl", - "Version": "4.3.3", + "Version": "5.2.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "0eb86baa62f06e8855258fa5a8048667" + "Hash": "411ca2c03b1ce5f548345d2fc2685f7a" }, "desc": { "Package": "desc", - "Version": "1.4.2", + "Version": "1.4.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "R6", "cli", - "rprojroot", "utils" ], - "Hash": "6b9602c7ebbe87101a9c8edb6e8b6d21" + "Hash": "99b79fcbd6c4d1ce087f5c5c758b384f" }, "digest": { "Package": "digest", - "Version": "0.6.31", + "Version": "0.6.35", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "utils" ], - "Hash": "8b708f296afd9ae69f450f9640be8990" + "Hash": "698ece7ba5a4fa4559e3d537e7ec3d31" }, "dplyr": { "Package": "dplyr", - "Version": "1.0.10", + "Version": "1.1.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "R6", + "cli", "generics", "glue", "lifecycle", @@ -268,29 +274,18 @@ "utils", "vctrs" ], - "Hash": "539412282059f7f0c07295723d23f987" - }, - "ellipsis": { - "Package": "ellipsis", - "Version": "0.3.2", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "rlang" - ], - "Hash": "bb0eec2fe32e88d9e2836c2f73ea2077" + "Hash": "fedd9d00c2944ff00a0e2696ccf048ec" }, "evaluate": { "Package": "evaluate", - "Version": "0.19", + "Version": "0.23", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "methods" ], - "Hash": "5aac3cd0a3ccb1a738941796b28c26fe" + "Hash": "daf4a1246be12c1fa8c7705a0935c1a0" }, "extrafont": { "Package": "extrafont", @@ -318,7 +313,7 @@ }, "fansi": { "Package": "fansi", - "Version": "1.0.3", + "Version": "1.0.6", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -326,7 +321,7 @@ "grDevices", "utils" ], - "Hash": "83a8afdbe71839506baa9f90eebad7ec" + "Hash": "962174cf2aeb5b9eea581522286a911f" }, "farver": { "Package": "farver", @@ -337,14 +332,34 @@ }, "fastmap": { "Package": "fastmap", - "Version": "1.1.0", + "Version": "1.1.1", + "Source": "Repository", + "Repository": "CRAN", + "Hash": "f7736a18de97dea803bde0a2daaafb27" + }, + "fontBitstreamVera": { + "Package": "fontBitstreamVera", + "Version": "0.1.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "77bd60a6157420d4ffa93b27cf6a58b8" + "Requirements": [ + "R" + ], + "Hash": "f6068021eff4aba735a9b2353516636c" + }, + "fontLiberation": { + "Package": "fontLiberation", + "Version": "0.1.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "f918c5e723f86f409912104d5b7a71d6" }, "fontawesome": { "Package": "fontawesome", - "Version": "0.4.0", + "Version": "0.5.2", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -352,52 +367,63 @@ "htmltools", "rlang" ], - "Hash": "c5a628c2570aa86a96cc6ef739d8bfda" + "Hash": "c2efdd5f0bcd1ea861c2d4e2a883a67d" + }, + "fontquiver": { + "Package": "fontquiver", + "Version": "0.2.1", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "fontBitstreamVera", + "fontLiberation" + ], + "Hash": "fc0f4226379e451057d55419fd31761e" }, "forcats": { "Package": "forcats", - "Version": "0.5.2", + "Version": "1.0.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "cli", - "ellipsis", "glue", "lifecycle", "magrittr", "rlang", - "tibble", - "withr" + "tibble" ], - "Hash": "9d95bc88206321cd1bc98480ecfd74bb" + "Hash": "1a0a9a3d5083d0d573c4214576f1e690" }, "fs": { "Package": "fs", - "Version": "1.5.2", + "Version": "1.6.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "methods" ], - "Hash": "7c89603d81793f0d5486d91ab1fc6f1d" + "Hash": "47b5f30c720c23999b913a1a635cf0bb" }, "gdtools": { "Package": "gdtools", - "Version": "0.3.0", + "Version": "0.3.7", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "Rcpp", + "curl", + "fontquiver", "gfonts", "htmltools", - "memoise", "systemfonts", "tools" ], - "Hash": "657d2b1625665dedb42b932feb1b109c" + "Hash": "b53e23731a5946448ad888efca14d2df" }, "generics": { "Package": "generics", @@ -412,9 +438,9 @@ }, "gert": { "Package": "gert", - "Version": "1.9.2", + "Version": "2.0.1", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "askpass", "credentials", @@ -423,7 +449,7 @@ "sys", "zip" ], - "Hash": "9122b3958e749badb5c939f498038b57" + "Hash": "f70d3fe2d9e7654213a946963d1591eb" }, "gfonts": { "Package": "gfonts", @@ -444,7 +470,7 @@ }, "ggplot2": { "Package": "ggplot2", - "Version": "3.4.0", + "Version": "3.5.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -465,37 +491,25 @@ "vctrs", "withr" ], - "Hash": "fd2aab12f54400c6bca43687231e246b" - }, - "ggtext": { - "Package": "ggtext", - "Version": "0.1.2", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "ggplot2", - "grid", - "gridtext", - "rlang", - "scales" - ], - "Hash": "c5ba8f5056487403a299b91984be86ca" + "Hash": "44c6a2f8202d5b7e878ea274b1092426" }, "gh": { "Package": "gh", - "Version": "1.3.1", + "Version": "1.4.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "cli", "gitcreds", - "httr", + "glue", + "httr2", "ini", - "jsonlite" + "jsonlite", + "lifecycle", + "rlang" ], - "Hash": "b6a12054ee13dce0f6696c019c10e539" + "Hash": "fbbbc48eba7a6626a08bb365e44b563b" }, "gitcreds": { "Package": "gitcreds", @@ -509,45 +523,29 @@ }, "glue": { "Package": "glue", - "Version": "1.6.2", + "Version": "1.7.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "methods" ], - "Hash": "4f2596dfb05dac67b9dc558e5c6fba2e" - }, - "gridtext": { - "Package": "gridtext", - "Version": "0.1.5", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "Rcpp", - "curl", - "grDevices", - "grid", - "jpeg", - "markdown", - "png", - "rlang", - "stringr", - "xml2" - ], - "Hash": "05e4f5fffb1eecfeaac9ea0b7f255fef" + "Hash": "e0b3a53876554bd45879e596cdb10a52" }, "gtable": { "Package": "gtable", - "Version": "0.3.1", + "Version": "0.3.5", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", - "grid" + "cli", + "glue", + "grid", + "lifecycle", + "rlang" ], - "Hash": "36b4265fb818f6a342bed217549cd896" + "Hash": "e18861963cbc65a27736e02b3cd3c4a0" }, "highr": { "Package": "highr", @@ -560,11 +558,25 @@ ], "Hash": "06230136b2d2b9ba5805e1963fa6e890" }, + "hms": { + "Package": "hms", + "Version": "1.1.3", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "lifecycle", + "methods", + "pkgconfig", + "rlang", + "vctrs" + ], + "Hash": "b59377caa7ed00fa41808342002138f9" + }, "hrbrthemes": { "Package": "hrbrthemes", - "Version": "0.8.0", + "Version": "0.8.7", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "extrafont", @@ -572,35 +584,32 @@ "ggplot2", "grDevices", "grid", - "htmltools", - "knitr", "magrittr", - "rmarkdown", "scales", - "tools" + "tools", + "utils" ], - "Hash": "0d1257948f016840ad90320ed19c8c7d" + "Hash": "c115b4507f9fc1c754649e1d5899c46d" }, "htmltools": { "Package": "htmltools", - "Version": "0.5.4", + "Version": "0.5.8.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "base64enc", "digest", - "ellipsis", "fastmap", "grDevices", "rlang", "utils" ], - "Hash": "9d27e99cc90bd701c0a7a63e5923f9b7" + "Hash": "81d371a9cc60640e74e4ab6ac46dcedc" }, "htmlwidgets": { "Package": "htmlwidgets", - "Version": "1.6.1", + "Version": "1.6.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -611,7 +620,7 @@ "rmarkdown", "yaml" ], - "Hash": "b677ee5954471eaa974c0d099a343a1a" + "Hash": "04291cc45198225444a397606810ac37" }, "httpcode": { "Package": "httpcode", @@ -622,7 +631,7 @@ }, "httpuv": { "Package": "httpuv", - "Version": "1.6.7", + "Version": "1.6.15", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -633,22 +642,28 @@ "promises", "utils" ], - "Hash": "13fdc650c853fffbffee66b2a5b9fdbf" + "Hash": "d55aa087c47a63ead0f6fc10f8fa1ee0" }, - "httr": { - "Package": "httr", - "Version": "1.4.4", + "httr2": { + "Package": "httr2", + "Version": "1.0.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "R6", + "cli", "curl", - "jsonlite", - "mime", - "openssl" + "glue", + "lifecycle", + "magrittr", + "openssl", + "rappdirs", + "rlang", + "vctrs", + "withr" ], - "Hash": "57557fac46471f0dbbf44705cc6a5c8c" + "Hash": "03d741c92fda96d98c3a3f22494e3b4a" }, "ini": { "Package": "ini", @@ -670,12 +685,13 @@ }, "janitor": { "Package": "janitor", - "Version": "2.1.0", + "Version": "2.2.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "dplyr", + "hms", "lifecycle", "lubridate", "magrittr", @@ -687,17 +703,7 @@ "tidyr", "tidyselect" ], - "Hash": "6de84a8c67fb247e721166049c84695f" - }, - "jpeg": { - "Package": "jpeg", - "Version": "0.1-10", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R" - ], - "Hash": "031a0b683d001a7519202f0628fc0358" + "Hash": "5baae149f1082f466df9d1442ba7aa65" }, "jquerylib": { "Package": "jquerylib", @@ -711,24 +717,24 @@ }, "jsonlite": { "Package": "jsonlite", - "Version": "1.8.4", + "Version": "1.8.8", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "methods" ], - "Hash": "a4269a09a9b865579b2635c77e572374" + "Hash": "e1b9c55281c5adc4dd113652d9e26768" }, "knitr": { "Package": "knitr", - "Version": "1.41.9", + "Version": "1.46.3", "Source": "GitHub", "RemoteType": "github", - "RemoteHost": "api.github.com", "RemoteUsername": "yihui", "RemoteRepo": "knitr", "RemoteRef": "master", - "RemoteSha": "8ea8e42e5ad81a35fa653c40032779261061dd18", + "RemoteSha": "44a7bee566afff3eb4c8b13fd6fa64487e12981f", + "RemoteHost": "api.github.com", "Requirements": [ "R", "evaluate", @@ -738,33 +744,33 @@ "xfun", "yaml" ], - "Hash": "8135f42f1812936720323e8a55cd4b0b" + "Hash": "42f6ceea682a47bac45713054daa0fd1" }, "labeling": { "Package": "labeling", - "Version": "0.4.2", + "Version": "0.4.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "graphics", "stats" ], - "Hash": "3d5108641f47470611a32d0bdf357a72" + "Hash": "b64ec208ac5bc1852b285f665d6368b3" }, "later": { "Package": "later", - "Version": "1.3.0", + "Version": "1.3.2", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "Rcpp", "rlang" ], - "Hash": "7e7b457d7766bc47f2a5f21cc2984f8e" + "Hash": "a3e051d405326b8b0012377434c62b37" }, "lattice": { "Package": "lattice", - "Version": "0.20-45", + "Version": "0.22-6", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -775,7 +781,7 @@ "stats", "utils" ], - "Hash": "b64cdbb2b340437c4ee047a1f4c4377b" + "Hash": "cc5ac1ba4c238c7ca9fa6a87ca11a7e2" }, "lazyeval": { "Package": "lazyeval", @@ -789,7 +795,7 @@ }, "lifecycle": { "Package": "lifecycle", - "Version": "1.0.3", + "Version": "1.0.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -798,20 +804,20 @@ "glue", "rlang" ], - "Hash": "001cecbeac1cff9301bdc3775ee46a86" + "Hash": "b8552d117e1b808b09a832f589b79035" }, "lubridate": { "Package": "lubridate", - "Version": "1.9.0", + "Version": "1.9.3", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "generics", "methods", "timechange" ], - "Hash": "2af4550c2f0f7fbe7cbbf3dbf4ea3902" + "Hash": "680ad542fbcf801442c83a6ac5a2126c" }, "magrittr": { "Package": "magrittr", @@ -823,20 +829,6 @@ ], "Hash": "7ce2733a9826b3aeb1775d56fd305472" }, - "markdown": { - "Package": "markdown", - "Version": "1.4", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "commonmark", - "mime", - "utils", - "xfun" - ], - "Hash": "f99f5d2d7b2c2c031343bfa7b9f97980" - }, "memoise": { "Package": "memoise", "Version": "2.0.1", @@ -850,7 +842,7 @@ }, "mgcv": { "Package": "mgcv", - "Version": "1.8-41", + "Version": "1.9-1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -863,7 +855,7 @@ "stats", "utils" ], - "Hash": "6b3904f13346742caa3e82dd0303d4ad" + "Hash": "110ee9d83b496279960e162ac97764ce" }, "mime": { "Package": "mime", @@ -877,18 +869,18 @@ }, "munsell": { "Package": "munsell", - "Version": "0.5.0", + "Version": "0.5.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "colorspace", "methods" ], - "Hash": "6dfe8bf774944bd5595785e3229d8771" + "Hash": "4fd8900853b746af55b81fda99da7695" }, "nlme": { "Package": "nlme", - "Version": "3.1-161", + "Version": "3.1-164", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -898,33 +890,21 @@ "stats", "utils" ], - "Hash": "b49e163093c0ef46fbbfc40bcb87916c" + "Hash": "a623a2239e642806158bc4dc3f51565d" }, "openssl": { "Package": "openssl", - "Version": "2.0.5", + "Version": "2.1.2", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "askpass" ], - "Hash": "b04c27110bf367b4daa93f34f3d58e75" - }, - "packrat": { - "Package": "packrat", - "Version": "0.9.1", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "tools", - "utils" - ], - "Hash": "481428983c19a7c443f7ea1beff0a2de" + "Hash": "ea2475b073243d9d338aa8f086ce973e" }, "pillar": { "Package": "pillar", - "Version": "1.8.1", + "Version": "1.9.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -937,7 +917,7 @@ "utils", "vctrs" ], - "Hash": "f2316df30902c81729ae9de95ad5a608" + "Hash": "15da5a8412f317beeee6175fbc76f4bb" }, "pkgconfig": { "Package": "pkgconfig", @@ -949,19 +929,9 @@ ], "Hash": "01f28d4278f15c76cddbea05899c5d6f" }, - "png": { - "Package": "png", - "Version": "0.1-8", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R" - ], - "Hash": "bd54ba8a0a5faded999a7aab6e46b374" - }, "processx": { "Package": "processx", - "Version": "3.8.0", + "Version": "3.8.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -970,58 +940,58 @@ "ps", "utils" ], - "Hash": "a33ee2d9bf07564efb888ad98410da84" + "Hash": "0c90a7d71988856bad2a2a45dd871bb9" }, "promises": { "Package": "promises", - "Version": "1.2.0.1", + "Version": "1.3.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R6", "Rcpp", + "fastmap", "later", "magrittr", "rlang", "stats" ], - "Hash": "4ab2c43adb4d4699cf3690acd378d75d" + "Hash": "434cd5388a3979e74be5c219bcd6e77d" }, "ps": { "Package": "ps", - "Version": "1.7.2", + "Version": "1.7.6", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "utils" ], - "Hash": "68dd03d98a5efd1eb3012436de45ba83" + "Hash": "dd2b9319ee0656c8acf45c7f40c59de7" }, "ptrr": { "Package": "ptrr", - "Version": "0.2.1", + "Version": "0.2.1.9000", "Source": "GitHub", "RemoteType": "github", - "RemoteHost": "api.github.com", - "RemoteRepo": "ptrr", "RemoteUsername": "petrbouchal", + "RemoteRepo": "ptrr", "RemoteRef": "HEAD", - "RemoteSha": "0424228fd9e45902b655a3a3127cec038ba7e897", + "RemoteSha": "3ceb0da328597b82bc668630350e94b52426d3ed", + "RemoteHost": "api.github.com", "Requirements": [ "ggplot2", - "ggtext", "hrbrthemes", "magrittr", "scales", "systemfonts", "usethis" ], - "Hash": "1d98ac156438fcbf488804b2d490ca64" + "Hash": "e9f26399190b3dccec83d6d342335253" }, "purrr": { "Package": "purrr", - "Version": "1.0.1", + "Version": "1.0.2", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1032,24 +1002,27 @@ "rlang", "vctrs" ], - "Hash": "d71c815267c640f17ddbf7f16144b4bb" + "Hash": "1cba04a4e9414bdefc9dcaa99649a8dc" }, "quarto": { "Package": "quarto", - "Version": "1.2", + "Version": "1.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ + "R", + "cli", "jsonlite", "later", "processx", + "rlang", "rmarkdown", - "rsconnect", "rstudioapi", + "tools", "utils", "yaml" ], - "Hash": "298a252816cabed120391c955aced484" + "Hash": "c94c271f9b998d116186a78b2a9b23c1" }, "rappdirs": { "Package": "rappdirs", @@ -1063,17 +1036,17 @@ }, "reactR": { "Package": "reactR", - "Version": "0.4.4", + "Version": "0.5.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "htmltools" ], - "Hash": "75389c8091eb14ee21c6bc87a88b3809" + "Hash": "c9014fd1a435b2d790dd506589cb24e5" }, "reactable": { "Package": "reactable", - "Version": "0.4.3", + "Version": "0.4.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1084,90 +1057,72 @@ "jsonlite", "reactR" ], - "Hash": "4fec6f287e77503ceb822812722930d0" + "Hash": "6069eb2a6597963eae0605c1875ff14c" }, "renv": { "Package": "renv", - "Version": "1.0.0", + "Version": "1.0.7", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "utils" ], - "Hash": "c321cd99d56443dbffd1c9e673c0c1a2" + "Hash": "397b7b2a265bc5a7a06852524dabae20" }, "rlang": { "Package": "rlang", - "Version": "1.1.1", + "Version": "1.1.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "utils" ], - "Hash": "a85c767b55f0bf9b7ad16c6d7baee5bb" + "Hash": "42548638fae05fd9a9b5f3f437fbbbe2" }, "rmarkdown": { "Package": "rmarkdown", - "Version": "2.19", + "Version": "2.26", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "bslib", "evaluate", + "fontawesome", "htmltools", "jquerylib", "jsonlite", "knitr", "methods", - "stringr", "tinytex", "tools", "utils", "xfun", "yaml" ], - "Hash": "4e29299e1f4c7eabb0b8365b338adf3c" + "Hash": "9b148e7f95d33aac01f31282d49e4f44" }, "rprojroot": { "Package": "rprojroot", - "Version": "2.0.3", + "Version": "2.0.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "1de7ab598047a87bba48434ba35d497d" - }, - "rsconnect": { - "Package": "rsconnect", - "Version": "0.8.29", - "Source": "Repository", - "Repository": "CRAN", - "Requirements": [ - "R", - "curl", - "digest", - "jsonlite", - "openssl", - "packrat", - "rstudioapi", - "tools", - "yaml" - ], - "Hash": "fe178fc15af80952f546aafedf655b36" + "Hash": "4c8415e0ec1e29f3f4f6fc108bef0144" }, "rstudioapi": { "Package": "rstudioapi", - "Version": "0.14", + "Version": "0.16.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "690bd2acc42a9166ce34845884459320" + "Hash": "96710351d642b70e8f02ddeb237c46a7" }, "sass": { "Package": "sass", - "Version": "0.4.4", + "Version": "0.4.9", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1177,29 +1132,31 @@ "rappdirs", "rlang" ], - "Hash": "c76cbac7ca04ce82d8c38e29729987a3" + "Hash": "d53dbfddf695303ea4ad66f86e99b95d" }, "scales": { "Package": "scales", - "Version": "1.2.1", + "Version": "1.3.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "R6", "RColorBrewer", + "cli", "farver", + "glue", "labeling", "lifecycle", "munsell", "rlang", "viridisLite" ], - "Hash": "906cb23d2f1c5680b8ce439b44c6fa63" + "Hash": "c19df082ba346b0ffa6f833e92de34d1" }, "shiny": { "Package": "shiny", - "Version": "1.7.4", + "Version": "1.8.1.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1209,7 +1166,6 @@ "cachem", "commonmark", "crayon", - "ellipsis", "fastmap", "fontawesome", "glue", @@ -1229,33 +1185,33 @@ "withr", "xtable" ], - "Hash": "c2eae3d8c670fa9dfa35a12066f4a1d5" + "Hash": "54b26646816af9960a4c64d8ceec75d6" }, "snakecase": { "Package": "snakecase", - "Version": "0.11.0", + "Version": "0.11.1", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "stringi", "stringr" ], - "Hash": "4079070fc210c7901c0832a3aeab894f" + "Hash": "58767e44739b76965332e8a4fe3f91f1" }, "sourcetools": { "Package": "sourcetools", - "Version": "0.1.7", + "Version": "0.1.7-1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "947e4e02a79effa5d512473e10f41797" + "Hash": "5f5a7629f956619d519205ec475fe647" }, "stringi": { "Package": "stringi", - "Version": "1.7.8", + "Version": "1.8.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1264,11 +1220,11 @@ "tools", "utils" ], - "Hash": "a68b980681bcbc84c7a67003fa796bfb" + "Hash": "058aebddea264f4c99401515182e656a" }, "stringr": { "Package": "stringr", - "Version": "1.5.0", + "Version": "1.5.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1281,29 +1237,29 @@ "stringi", "vctrs" ], - "Hash": "671a4d384ae9d32fc47a14e98bfa3dc8" + "Hash": "960e2ae9e09656611e0b8214ad543207" }, "sys": { "Package": "sys", - "Version": "3.4.1", + "Version": "3.4.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "34c16f1ef796057bfa06d3f4ff818a5d" + "Hash": "3a1be13d68d47a8cd0bfd74739ca1555" }, "systemfonts": { "Package": "systemfonts", - "Version": "1.0.4", + "Version": "1.0.6", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "cpp11" ], - "Hash": "90b28393209827327de889f49935140a" + "Hash": "6d538cff441f0f1f36db2209ac7495ac" }, "tibble": { "Package": "tibble", - "Version": "3.1.8", + "Version": "3.2.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1318,33 +1274,34 @@ "utils", "vctrs" ], - "Hash": "56b6934ef0f8c68225949a8672fe1a8f" + "Hash": "a84e2cc86d07289b3b6f5069df7a004c" }, "tidyr": { "Package": "tidyr", - "Version": "1.2.1", + "Version": "1.3.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", + "cli", "cpp11", "dplyr", - "ellipsis", "glue", "lifecycle", "magrittr", "purrr", "rlang", + "stringr", "tibble", "tidyselect", "utils", "vctrs" ], - "Hash": "cdb403db0de33ccd1b6f53b83736efa8" + "Hash": "915fb7ce036c22a6a33b5a8adb712eb1" }, "tidyselect": { "Package": "tidyselect", - "Version": "1.2.0", + "Version": "1.2.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1356,38 +1313,38 @@ "vctrs", "withr" ], - "Hash": "79540e5fcd9e0435af547d885f184fd5" + "Hash": "829f27b9c4919c16b593794a6344d6c0" }, "timechange": { "Package": "timechange", - "Version": "0.1.1", + "Version": "0.3.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "cpp11" ], - "Hash": "4657195cc632097bb8d140d626b519fb" + "Hash": "c5f3c201b931cd6474d17d8700ccb1c8" }, "tinytex": { "Package": "tinytex", - "Version": "0.43", + "Version": "0.50", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "xfun" ], - "Hash": "facc02f3d63ed7dd765513c004c394ce" + "Hash": "be7a76845222ad20adb761f462eed3ea" }, "triebeard": { "Package": "triebeard", - "Version": "0.3.0", + "Version": "0.4.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "Rcpp" ], - "Hash": "847a9d113b78baca4a9a8639609ea228" + "Hash": "642507a148b0dd9b5620177e0a044413" }, "urltools": { "Package": "urltools", @@ -1404,19 +1361,19 @@ }, "utf8": { "Package": "utf8", - "Version": "1.2.2", + "Version": "1.2.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "c9c462b759a5cc844ae25b5942654d13" + "Hash": "62b65c52671e6665f803ff02954446e9" }, "vctrs": { "Package": "vctrs", - "Version": "0.5.1", + "Version": "0.6.5", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "cli", @@ -1424,17 +1381,17 @@ "lifecycle", "rlang" ], - "Hash": "970324f6572b4fd81db507b5d4062cb0" + "Hash": "c03fa420630029418f7e6da3667aac4a" }, "viridisLite": { "Package": "viridisLite", - "Version": "0.4.1", + "Version": "0.4.2", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "62f4b5da3e08d8e5bcba6cac15603f70" + "Hash": "c826c7c4241b6fc89ff55aaea3fa7491" }, "whisker": { "Package": "whisker", @@ -1445,45 +1402,47 @@ }, "withr": { "Package": "withr", - "Version": "2.5.0", + "Version": "3.0.0", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "grDevices", - "graphics", - "stats" + "graphics" ], - "Hash": "c0e49a9760983e81e55cdd9be92e7182" + "Hash": "d31b6c62c10dcf11ec530ca6b0dd5d35" }, "writexl": { "Package": "writexl", - "Version": "1.4.2", + "Version": "1.5.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "43da939eaf6681c88eba977b9012dad9" + "Hash": "856a075aec895ea1bea3055fa54e356c" }, "xfun": { "Package": "xfun", - "Version": "0.36", + "Version": "0.43", "Source": "Repository", "Repository": "CRAN", "Requirements": [ + "grDevices", "stats", "tools" ], - "Hash": "f5baec54606751aa53ac9c0e05848ed6" + "Hash": "ab6371d8653ce5f2f9290f4ec7b42a8e" }, "xml2": { "Package": "xml2", - "Version": "1.3.3", + "Version": "1.3.6", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", - "methods" + "cli", + "methods", + "rlang" ], - "Hash": "40682ed6a969ea5abfd351eb67833adc" + "Hash": "1d0336142f4cd25d8d23cd3ba7a8fb61" }, "xtable": { "Package": "xtable", @@ -1499,17 +1458,17 @@ }, "yaml": { "Package": "yaml", - "Version": "2.3.6", + "Version": "2.3.8", "Source": "Repository", "Repository": "CRAN", - "Hash": "9b570515751dcbae610f29885e025b41" + "Hash": "29240487a071f535f5e5d5a323b7afbd" }, "zip": { "Package": "zip", - "Version": "2.2.2", + "Version": "2.3.1", "Source": "Repository", - "Repository": "CRAN", - "Hash": "c42bfcec3fa6a0cce17ce1f8bc684f88" + "Repository": "RSPM", + "Hash": "fcc4bd8e6da2d2011eb64a5e5cc685ab" } } } diff --git a/renv/activate.R b/renv/activate.R index cc742fc..d13f993 100644 --- a/renv/activate.R +++ b/renv/activate.R @@ -2,11 +2,28 @@ local({ # the requested version of renv - version <- "1.0.0" + version <- "1.0.7" attr(version, "sha") <- NULL # the project directory - project <- getwd() + project <- Sys.getenv("RENV_PROJECT") + if (!nzchar(project)) + project <- getwd() + + # use start-up diagnostics if enabled + diagnostics <- Sys.getenv("RENV_STARTUP_DIAGNOSTICS", unset = "FALSE") + if (diagnostics) { + start <- Sys.time() + profile <- tempfile("renv-startup-", fileext = ".Rprof") + utils::Rprof(profile) + on.exit({ + utils::Rprof(NULL) + elapsed <- signif(difftime(Sys.time(), start, units = "auto"), digits = 2L) + writeLines(sprintf("- renv took %s to run the autoloader.", format(elapsed))) + writeLines(sprintf("- Profile: %s", profile)) + print(utils::summaryRprof(profile)) + }, add = TRUE) + } # figure out whether the autoloader is enabled enabled <- local({ @@ -16,6 +33,14 @@ local({ if (!is.null(override)) return(override) + # if we're being run in a context where R_LIBS is already set, + # don't load -- presumably we're being run as a sub-process and + # the parent process has already set up library paths for us + rcmd <- Sys.getenv("R_CMD", unset = NA) + rlibs <- Sys.getenv("R_LIBS", unset = NA) + if (!is.na(rlibs) && !is.na(rcmd)) + return(FALSE) + # next, check environment variables # TODO: prefer using the configuration one in the future envvars <- c( @@ -35,9 +60,22 @@ local({ }) - if (!enabled) + # bail if we're not enabled + if (!enabled) { + + # if we're not enabled, we might still need to manually load + # the user profile here + profile <- Sys.getenv("R_PROFILE_USER", unset = "~/.Rprofile") + if (file.exists(profile)) { + cfg <- Sys.getenv("RENV_CONFIG_USER_PROFILE", unset = "TRUE") + if (tolower(cfg) %in% c("true", "t", "1")) + sys.source(profile, envir = globalenv()) + } + return(FALSE) + } + # avoid recursion if (identical(getOption("renv.autoloader.running"), TRUE)) { warning("ignoring recursive attempt to run renv autoloader") @@ -93,6 +131,21 @@ local({ } + heredoc <- function(text, leave = 0) { + + # remove leading, trailing whitespace + trimmed <- gsub("^\\s*\\n|\\n\\s*$", "", text) + + # split into lines + lines <- strsplit(trimmed, "\n", fixed = TRUE)[[1L]] + + # compute common indent + indent <- regexpr("[^[:space:]]", lines) + common <- min(setdiff(indent, -1L)) - leave + paste(substring(lines, common), collapse = "\n") + + } + startswith <- function(string, prefix) { substring(string, 1, nchar(prefix)) == prefix } @@ -504,7 +557,7 @@ local({ # open the bundle for reading # We use gzcon for everything because (from ?gzcon) - # > Reading from a connection which does not supply a ‘gzip’ magic + # > Reading from a connection which does not supply a 'gzip' magic # > header is equivalent to reading from the original connection conn <- gzcon(file(bundle, open = "rb", raw = TRUE)) on.exit(close(conn)) @@ -595,6 +648,9 @@ local({ # if the user has requested an automatic prefix, generate it auto <- Sys.getenv("RENV_PATHS_PREFIX_AUTO", unset = NA) + if (is.na(auto) && getRversion() >= "4.4.0") + auto <- "TRUE" + if (auto %in% c("TRUE", "True", "true", "1")) return(renv_bootstrap_platform_prefix_auto()) @@ -767,10 +823,12 @@ local({ renv_bootstrap_validate_version <- function(version, description = NULL) { # resolve description file - description <- description %||% { - path <- getNamespaceInfo("renv", "path") - packageDescription("renv", lib.loc = dirname(path)) - } + # + # avoid passing lib.loc to `packageDescription()` below, since R will + # use the loaded version of the package by default anyhow. note that + # this function should only be called after 'renv' is loaded + # https://github.com/rstudio/renv/issues/1625 + description <- description %||% packageDescription("renv") # check whether requested version 'version' matches loaded version of renv sha <- attr(version, "sha", exact = TRUE) @@ -784,24 +842,23 @@ local({ # the loaded version of renv doesn't match the requested version; # give the user instructions on how to proceed - remote <- if (!is.null(description[["RemoteSha"]])) { + dev <- identical(description[["RemoteType"]], "github") + remote <- if (dev) paste("rstudio/renv", description[["RemoteSha"]], sep = "@") - } else { + else paste("renv", description[["Version"]], sep = "@") - } # display both loaded version + sha if available friendly <- renv_bootstrap_version_friendly( version = description[["Version"]], - sha = description[["RemoteSha"]] + sha = if (dev) description[["RemoteSha"]] ) - fmt <- paste( - "renv %1$s was loaded from project library, but this project is configured to use renv %2$s.", - "- Use `renv::record(\"%3$s\")` to record renv %1$s in the lockfile.", - "- Use `renv::restore(packages = \"renv\")` to install renv %2$s into the project library.", - sep = "\n" - ) + fmt <- heredoc(" + renv %1$s was loaded from project library, but this project is configured to use renv %2$s. + - Use `renv::record(\"%3$s\")` to record renv %1$s in the lockfile. + - Use `renv::restore(packages = \"renv\")` to install renv %2$s into the project library. + ") catf(fmt, friendly, renv_bootstrap_version_friendly(version), remote) FALSE @@ -841,7 +898,7 @@ local({ hooks <- getHook("renv::autoload") for (hook in hooks) if (is.function(hook)) - tryCatch(hook(), error = warning) + tryCatch(hook(), error = warnify) # load the project renv::load(project) @@ -982,10 +1039,15 @@ local({ } - renv_bootstrap_version_friendly <- function(version, sha = NULL) { + renv_bootstrap_version_friendly <- function(version, shafmt = NULL, sha = NULL) { sha <- sha %||% attr(version, "sha", exact = TRUE) - parts <- c(version, sprintf("[sha: %s]", substring(sha, 1L, 7L))) - paste(parts, collapse = " ") + parts <- c(version, sprintf(shafmt %||% " [sha: %s]", substring(sha, 1L, 7L))) + paste(parts, collapse = "") + } + + renv_bootstrap_exec <- function(project, libpath, version) { + if (!renv_bootstrap_load(project, libpath, version)) + renv_bootstrap_run(version, libpath) } renv_bootstrap_run <- function(version, libpath) { @@ -1012,11 +1074,6 @@ local({ } - - renv_bootstrap_in_rstudio <- function() { - commandArgs()[[1]] == "RStudio" - } - renv_json_read <- function(file = NULL, text = NULL) { jlerr <- NULL @@ -1024,7 +1081,7 @@ local({ # if jsonlite is loaded, use that instead if ("jsonlite" %in% loadedNamespaces()) { - json <- catch(renv_json_read_jsonlite(file, text)) + json <- tryCatch(renv_json_read_jsonlite(file, text), error = identity) if (!inherits(json, "error")) return(json) @@ -1033,7 +1090,7 @@ local({ } # otherwise, fall back to the default JSON reader - json <- catch(renv_json_read_default(file, text)) + json <- tryCatch(renv_json_read_default(file, text), error = identity) if (!inherits(json, "error")) return(json) @@ -1046,14 +1103,14 @@ local({ } renv_json_read_jsonlite <- function(file = NULL, text = NULL) { - text <- paste(text %||% read(file), collapse = "\n") + text <- paste(text %||% readLines(file, warn = FALSE), collapse = "\n") jsonlite::fromJSON(txt = text, simplifyVector = FALSE) } renv_json_read_default <- function(file = NULL, text = NULL) { # find strings in the JSON - text <- paste(text %||% read(file), collapse = "\n") + text <- paste(text %||% readLines(file, warn = FALSE), collapse = "\n") pattern <- '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]' locs <- gregexpr(pattern, text, perl = TRUE)[[1]] @@ -1101,14 +1158,14 @@ local({ map <- as.list(map) # remap strings in object - remapped <- renv_json_remap(json, map) + remapped <- renv_json_read_remap(json, map) # evaluate eval(remapped, envir = baseenv()) } - renv_json_remap <- function(json, map) { + renv_json_read_remap <- function(json, map) { # fix names if (!is.null(names(json))) { @@ -1135,7 +1192,7 @@ local({ # recurse if (is.recursive(json)) { for (i in seq_along(json)) { - json[i] <- list(renv_json_remap(json[[i]], map)) + json[i] <- list(renv_json_read_remap(json[[i]], map)) } } @@ -1155,26 +1212,8 @@ local({ # construct full libpath libpath <- file.path(root, prefix) - # attempt to load - if (renv_bootstrap_load(project, libpath, version)) - return(TRUE) - - if (renv_bootstrap_in_rstudio()) { - setHook("rstudio.sessionInit", function(...) { - renv_bootstrap_run(version, libpath) - - # Work around buglet in RStudio if hook uses readline - tryCatch( - { - tools <- as.environment("tools:rstudio") - tools$.rs.api.sendToConsole("", echo = FALSE, focus = FALSE) - }, - error = function(cnd) {} - ) - }) - } else { - renv_bootstrap_run(version, libpath) - } + # run bootstrap code + renv_bootstrap_exec(project, libpath, version) invisible()