diff --git a/renv.lock b/renv.lock index 77b2b62..5e0a5bc 100644 --- a/renv.lock +++ b/renv.lock @@ -1,6 +1,6 @@ { "R": { - "Version": "4.4.0", + "Version": "4.3.2", "Repositories": [ { "Name": "BioCsoft", @@ -29,7 +29,7 @@ ] }, "Bioconductor": { - "Version": "3.19" + "Version": "3.18" }, "Packages": { "ANCOMBC": { @@ -73,34 +73,31 @@ }, "Biobase": { "Package": "Biobase", - "Version": "2.64.0", + "Version": "2.62.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "BiocGenerics", "R", "methods", "utils" ], - "Hash": "9bc4cabd3bfda461409172213d932813" + "Hash": "38252a34e82d3ff6bb46b4e2252d2dce" }, "BiocBaseUtils": { "Package": "BiocBaseUtils", - "Version": "1.6.0", + "Version": "1.4.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "R", "methods", "utils" ], - "Hash": "7fcaec00d8feb85919c022d9e4237133" + "Hash": "8fdda3c850b2bea92ad4d0877c9549d1" }, "BiocGenerics": { "Package": "BiocGenerics", - "Version": "0.50.0", + "Version": "0.48.1", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "R", "graphics", @@ -108,7 +105,7 @@ "stats", "utils" ], - "Hash": "ef32d07aafdd12f24c5827374ae3590d" + "Hash": "e34278c65d7dffcc08f737bf0944ca9a" }, "BiocManager": { "Package": "BiocManager", @@ -122,9 +119,9 @@ }, "BiocNeighbors": { "Package": "BiocNeighbors", - "Version": "1.22.0", + "Version": "1.20.2", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", + "Repository": "Bioconductor 3.18", "Requirements": [ "BiocParallel", "Matrix", @@ -134,13 +131,12 @@ "methods", "stats" ], - "Hash": "da9f332c88453734623406dcca13ee03" + "Hash": "c5c8ade5852fd3b25c66ec28873d00f1" }, "BiocParallel": { "Package": "BiocParallel", - "Version": "1.38.0", + "Version": "1.36.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "BH", "R", @@ -153,13 +149,12 @@ "stats", "utils" ], - "Hash": "7b6e79f86e3d1c23f62c5e2052e848d4" + "Hash": "6d1689ee8b65614ba6ef4012a67b663a" }, "BiocSingular": { "Package": "BiocSingular", - "Version": "1.20.0", + "Version": "1.18.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "BiocGenerics", "BiocParallel", @@ -174,23 +169,22 @@ "rsvd", "utils" ], - "Hash": "9d2e9fbd803f4eddfeb307b1ee376aad" + "Hash": "bed2b7ea3b0b0b31387d1d80286abb97" }, "BiocVersion": { "Package": "BiocVersion", - "Version": "3.19.1", + "Version": "3.18.1", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "R" ], - "Hash": "b892e27fc9659a4c8f8787d34c37b8b2" + "Hash": "2ecaed86684f5fae76ed5530f9d29c4a" }, "Biostrings": { "Package": "Biostrings", - "Version": "2.72.0", + "Version": "2.70.2", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", + "Repository": "Bioconductor 3.18", "Requirements": [ "BiocGenerics", "GenomeInfoDb", @@ -200,11 +194,12 @@ "XVector", "crayon", "grDevices", + "graphics", "methods", "stats", "utils" ], - "Hash": "48618c7c7b90b503837824ebcfee6363" + "Hash": "b7cc779ab741dce3ad1b419ada1564c9" }, "CVXR": { "Package": "CVXR", @@ -242,31 +237,32 @@ }, "DBI": { "Package": "DBI", - "Version": "1.2.2", + "Version": "1.2.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "methods" ], - "Hash": "164809cd72e1d5160b4cb3aa57f510fe" + "Hash": "9b4993e98e0e19da84c168460c032fef" }, "DECIPHER": { "Package": "DECIPHER", - "Version": "3.0.0", + "Version": "2.30.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "Biostrings", "DBI", "IRanges", "R", + "RSQLite", "S4Vectors", "XVector", "methods", + "parallel", "stats" ], - "Hash": "d11d136f8ca6ede1ecfa471e35f3195f" + "Hash": "ed6ffca930dbb0fc6510411bab734787" }, "DEoptimR": { "Package": "DEoptimR", @@ -280,9 +276,8 @@ }, "DelayedArray": { "Package": "DelayedArray", - "Version": "0.30.0", + "Version": "0.28.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "BiocGenerics", "IRanges", @@ -296,13 +291,12 @@ "stats", "stats4" ], - "Hash": "9141899d1bb4ce53e036810eb217721f" + "Hash": "0e5c84e543a3d04ce64c6f60ed46d7eb" }, "DelayedMatrixStats": { "Package": "DelayedMatrixStats", - "Version": "1.26.0", + "Version": "1.24.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "DelayedArray", "IRanges", @@ -312,7 +306,7 @@ "methods", "sparseMatrixStats" ], - "Hash": "5d9536664ccddb0eaa68a90afe4ee76e" + "Hash": "71c2d178d33f9d91999f67dc2d53b747" }, "DescTools": { "Package": "DescTools", @@ -345,9 +339,8 @@ }, "DirichletMultinomial": { "Package": "DirichletMultinomial", - "Version": "1.46.0", + "Version": "1.44.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "BiocGenerics", "IRanges", @@ -355,7 +348,7 @@ "methods", "stats4" ], - "Hash": "220a1c460ab5a750477fb5431e192abd" + "Hash": "18131c758b36c44d13e2ca9fdf656343" }, "ECOSolveR": { "Package": "ECOSolveR", @@ -404,37 +397,36 @@ }, "GenomeInfoDb": { "Package": "GenomeInfoDb", - "Version": "1.40.0", + "Version": "1.38.5", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", + "Repository": "Bioconductor 3.18", "Requirements": [ "BiocGenerics", "GenomeInfoDbData", "IRanges", "R", + "RCurl", "S4Vectors", - "UCSC.utils", "methods", "stats", "stats4", "utils" ], - "Hash": "614124bc9fb80d222cfa0d2e3e76c339" + "Hash": "7575d02551088d69cfcbf65a3a6f0b08" }, "GenomeInfoDbData": { "Package": "GenomeInfoDbData", - "Version": "1.2.12", + "Version": "1.2.11", "Source": "Bioconductor", "Requirements": [ "R" ], - "Hash": "c3c792a7b7f2677be56e8632c5b7543d" + "Hash": "10f32956181d1d46bd8402c93ac193e8" }, "GenomicRanges": { "Package": "GenomicRanges", - "Version": "1.56.0", + "Version": "1.54.1", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "BiocGenerics", "GenomeInfoDb", @@ -447,16 +439,15 @@ "stats4", "utils" ], - "Hash": "0fab423e3f49e207681eb404d9182a1e" + "Hash": "7e0c1399af35369312d9c399454374e8" }, "Hmisc": { "Package": "Hmisc", - "Version": "5.1-2", + "Version": "5.1-1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "Formula", - "R", "base64enc", "cluster", "colorspace", @@ -475,13 +466,12 @@ "rpart", "viridis" ], - "Hash": "c0d441bec5693f2cad30231f7f72d90a" + "Hash": "27c7750992bc511728e2f9ebd2911199" }, "IRanges": { "Package": "IRanges", - "Version": "2.38.0", + "Version": "2.36.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "BiocGenerics", "R", @@ -491,11 +481,11 @@ "stats4", "utils" ], - "Hash": "836770692f7c8401090519228b93af32" + "Hash": "f98500eeb93e8a66ad65be955a848595" }, "MASS": { "Package": "MASS", - "Version": "7.3-60", + "Version": "7.3-60.0.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -506,7 +496,7 @@ "stats", "utils" ], - "Hash": "a56a6365b3fa73293ea8d084be0d9bb0" + "Hash": "b765b28387acc8ec9e9c1530713cb19c" }, "Matrix": { "Package": "Matrix", @@ -527,20 +517,18 @@ }, "MatrixGenerics": { "Package": "MatrixGenerics", - "Version": "1.16.0", + "Version": "1.14.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "matrixStats", "methods" ], - "Hash": "152dbbcde6a9a7c7f3beef79b68cd76a" + "Hash": "088cd2077b5619fcb7b373b1a45174e7" }, "MultiAssayExperiment": { "Package": "MultiAssayExperiment", - "Version": "1.30.0", + "Version": "1.28.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "Biobase", "BiocBaseUtils", @@ -556,7 +544,7 @@ "tidyr", "utils" ], - "Hash": "fd093813cfc6695f791672cba3c128dc" + "Hash": "2c3a92453352cc815a92a9cebc576392" }, "R6": { "Package": "R6", @@ -578,6 +566,37 @@ ], "Hash": "45f0398006e83a5b10b72a90663d8d8c" }, + "RCurl": { + "Package": "RCurl", + "Version": "1.98-1.14", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "bitops", + "methods" + ], + "Hash": "47f648d288079d0c696804ad4e55197e" + }, + "RSQLite": { + "Package": "RSQLite", + "Version": "2.3.5", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "DBI", + "R", + "bit64", + "blob", + "cpp11", + "memoise", + "methods", + "pkgconfig", + "plogr", + "rlang" + ], + "Hash": "f5a75d57e0a3014a6ef537ac04a80fc6" + }, "RSpectra": { "Package": "RSpectra", "Version": "0.16-1", @@ -616,7 +635,7 @@ }, "RcppArmadillo": { "Package": "RcppArmadillo", - "Version": "0.12.8.2.1", + "Version": "0.12.6.6.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -626,11 +645,11 @@ "stats", "utils" ], - "Hash": "d5448fb24fb114c4da1275a37a571f37" + "Hash": "d2b60e0a15d73182a3a766ff0a7d0d7f" }, "RcppEigen": { "Package": "RcppEigen", - "Version": "0.3.4.0.0", + "Version": "0.3.3.9.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -639,7 +658,7 @@ "stats", "utils" ], - "Hash": "df49e3306f232ec28f1604e36a202847" + "Hash": "acb0a5bf38490f26ab8661b467f4f53a" }, "RcppHNSW": { "Package": "RcppHNSW", @@ -689,13 +708,13 @@ }, "Rhdf5lib": { "Package": "Rhdf5lib", - "Version": "1.26.0", + "Version": "1.24.1", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", + "Repository": "Bioconductor 3.18", "Requirements": [ "R" ], - "Hash": "c92ba8b9a2c5c9ff600a1062a3b7b727" + "Hash": "beaded2ac0f712ae3d8409f5fa470381" }, "Rmpfr": { "Package": "Rmpfr", @@ -724,9 +743,8 @@ }, "S4Arrays": { "Package": "S4Arrays", - "Version": "1.4.0", + "Version": "1.2.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "BiocGenerics", "IRanges", @@ -738,13 +756,13 @@ "methods", "stats" ], - "Hash": "665d1f150ce8a6e7614375eafdbad645" + "Hash": "b92a69b0bc7bce3d22f201c3b1126664" }, "S4Vectors": { "Package": "S4Vectors", - "Version": "0.42.0", + "Version": "0.40.2", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", + "Repository": "Bioconductor 3.18", "Requirements": [ "BiocGenerics", "R", @@ -753,26 +771,24 @@ "stats4", "utils" ], - "Hash": "245ac721ca6088200392ea5251db9e3c" + "Hash": "1716e201f81ced0f456dd5ec85fe20f8" }, "ScaledMatrix": { "Package": "ScaledMatrix", - "Version": "1.12.0", + "Version": "1.10.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "DelayedArray", "Matrix", "S4Vectors", "methods" ], - "Hash": "bac1c808a92d9c3f45d05e7a8c1b74f0" + "Hash": "ecab4b44d12fc7642a7161f71f3397b5" }, "SingleCellExperiment": { "Package": "SingleCellExperiment", - "Version": "1.26.0", + "Version": "1.24.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "BiocGenerics", "DelayedArray", @@ -783,13 +799,13 @@ "stats", "utils" ], - "Hash": "4476ad434a5e7887884521417cab3764" + "Hash": "e21b3571ce76eb4dfe6bf7900960aa6a" }, "SparseArray": { "Package": "SparseArray", - "Version": "1.4.0", + "Version": "1.2.3", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", + "Repository": "Bioconductor 3.18", "Requirements": [ "BiocGenerics", "IRanges", @@ -803,13 +819,12 @@ "methods", "stats" ], - "Hash": "84697af365cd2a6367fa5d2c1086298c" + "Hash": "06313606606691b8fdf712587a021dd6" }, "SummarizedExperiment": { "Package": "SummarizedExperiment", - "Version": "1.34.0", + "Version": "1.32.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "Biobase", "BiocGenerics", @@ -827,7 +842,7 @@ "tools", "utils" ], - "Hash": "2f6c8cc972ed6aee07c96e3dff729d15" + "Hash": "caee529bf9710ff6fe1776612fcaa266" }, "TH.data": { "Package": "TH.data", @@ -843,9 +858,8 @@ }, "TreeSummarizedExperiment": { "Package": "TreeSummarizedExperiment", - "Version": "2.12.0", + "Version": "2.10.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "BiocGenerics", "BiocParallel", @@ -862,27 +876,12 @@ "treeio", "utils" ], - "Hash": "01b3e9ea619db17c2b499588ea05a7ae" - }, - "UCSC.utils": { - "Package": "UCSC.utils", - "Version": "1.0.0", - "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", - "Requirements": [ - "S4Vectors", - "httr", - "jsonlite", - "methods", - "stats" - ], - "Hash": "83d45b690bffd09d1980c224ef329f5b" + "Hash": "c9ac8afa5ad1ec7451a61e70f199aeb0" }, "XVector": { "Package": "XVector", - "Version": "0.44.0", + "Version": "0.42.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "BiocGenerics", "IRanges", @@ -893,7 +892,7 @@ "utils", "zlibbioc" ], - "Hash": "4245b9938ac74c0dbddbebbec6036ab4" + "Hash": "65c0b6bca03f88758f86ef0aa18c4873" }, "abind": { "Package": "abind", @@ -929,7 +928,7 @@ }, "ape": { "Package": "ape", - "Version": "5.8", + "Version": "5.7-1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -944,7 +943,7 @@ "stats", "utils" ], - "Hash": "16b5ff4dff0ead9ea955f62f794b1535" + "Hash": "10705eec964349f270504754d8fe8ef1" }, "askpass": { "Package": "askpass", @@ -994,9 +993,8 @@ }, "beachmat": { "Package": "beachmat", - "Version": "2.20.0", + "Version": "2.18.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "BiocGenerics", "DelayedArray", @@ -1005,7 +1003,7 @@ "SparseArray", "methods" ], - "Hash": "10e94b1bce9070632a40c6b873f8b2d4" + "Hash": "0907299d009cbc2d17adfbfa1ffb5ac5" }, "beeswarm": { "Package": "beeswarm", @@ -1022,9 +1020,8 @@ }, "biomformat": { "Package": "biomformat", - "Version": "1.32.0", + "Version": "1.30.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "Matrix", "R", @@ -1033,7 +1030,7 @@ "plyr", "rhdf5" ], - "Hash": "672cb781e6ec57e8c156e6d663723ef6" + "Hash": "52122660913b933a52839f8de921ab33" }, "bit": { "Package": "bit", @@ -1059,11 +1056,29 @@ ], "Hash": "9fe98599ca456d6552421db0d6772d8f" }, + "bitops": { + "Package": "bitops", + "Version": "1.0-7", + "Source": "Repository", + "Repository": "CRAN", + "Hash": "b7d8d8ee39869c18d8846a184dd8a1af" + }, + "blob": { + "Package": "blob", + "Version": "1.2.4", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "methods", + "rlang", + "vctrs" + ], + "Hash": "40415719b5a479b87949f3aa0aee737c" + }, "bluster": { "Package": "bluster", - "Version": "1.14.0", + "Version": "1.12.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "BiocNeighbors", "BiocParallel", @@ -1076,11 +1091,11 @@ "stats", "utils" ], - "Hash": "ed9597168d850071aa9abbbef7be7204" + "Hash": "fca0d5ffad6380f13cad4d7855107aef" }, "boot": { "Package": "boot", - "Version": "1.3-30", + "Version": "1.3-28.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1088,7 +1103,7 @@ "graphics", "stats" ], - "Hash": "96abeed416a286d4a0f52e550b612343" + "Hash": "9a052fbcbe97a98ceb18dbfd30ebd96e" }, "brew": { "Package": "brew", @@ -1099,13 +1114,13 @@ }, "brio": { "Package": "brio", - "Version": "1.1.5", + "Version": "1.1.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "c1ee497a6d999947c2c224ae46799b1a" + "Hash": "68bd2b066e1fe780bbf62fc8bcc36de3" }, "broom": { "Package": "broom", @@ -1130,14 +1145,13 @@ }, "bslib": { "Package": "bslib", - "Version": "0.7.0", + "Version": "0.6.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "base64enc", "cachem", - "fastmap", "grDevices", "htmltools", "jquerylib", @@ -1148,7 +1162,7 @@ "rlang", "sass" ], - "Hash": "8644cc53f43828f19133548195d7e59e" + "Hash": "c0d8599494bc7fb408cd206bbdd9cab0" }, "cachem": { "Package": "cachem", @@ -1163,7 +1177,7 @@ }, "callr": { "Package": "callr", - "Version": "3.7.6", + "Version": "3.7.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1172,7 +1186,7 @@ "processx", "utils" ], - "Hash": "d7e13f49c19103ece9e58ad2d83a7354" + "Hash": "9b2191ede20fa29828139b9900922e51" }, "cellranger": { "Package": "cellranger", @@ -1378,24 +1392,24 @@ }, "curl": { "Package": "curl", - "Version": "5.2.1", + "Version": "5.2.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "411ca2c03b1ce5f548345d2fc2685f7a" + "Hash": "ce88d13c0b10fe88a37d9c59dba2d7f9" }, "data.table": { "Package": "data.table", - "Version": "1.15.4", + "Version": "1.15.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "methods" ], - "Hash": "8ee9ac56ef633d0c7cab8b2ca87d683e" + "Hash": "cfbbb4aed6e78cd45f17123a9ec9981a" }, "decontam": { "Package": "decontam", @@ -1474,14 +1488,14 @@ }, "digest": { "Package": "digest", - "Version": "0.6.35", + "Version": "0.6.34", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "utils" ], - "Hash": "698ece7ba5a4fa4559e3d537e7ec3d31" + "Hash": "7ede2ee9ea8d3edbf1ca84c1e333ad1a" }, "doParallel": { "Package": "doParallel", @@ -1735,14 +1749,14 @@ }, "fs": { "Package": "fs", - "Version": "1.6.4", + "Version": "1.6.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "methods" ], - "Hash": "15aeb8c27f5ea5161f9f6a641fafd93a" + "Hash": "47b5f30c720c23999b913a1a635cf0bb" }, "futile.logger": { "Package": "futile.logger", @@ -1823,7 +1837,7 @@ }, "ggplot2": { "Package": "ggplot2", - "Version": "3.5.1", + "Version": "3.4.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1844,7 +1858,7 @@ "vctrs", "withr" ], - "Hash": "44c6a2f8202d5b7e878ea274b1092426" + "Hash": "313d31eff2274ecf4c1d3581db7241f9" }, "ggrastr": { "Package": "ggrastr", @@ -1897,21 +1911,19 @@ }, "gh": { "Package": "gh", - "Version": "1.4.1", + "Version": "1.4.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "cli", "gitcreds", - "glue", "httr2", "ini", "jsonlite", - "lifecycle", "rlang" ], - "Hash": "fbbbc48eba7a6626a08bb365e44b563b" + "Hash": "03533b1c875028233598f848fda44c4c" }, "gitcreds": { "Package": "gitcreds", @@ -2004,7 +2016,7 @@ }, "gtable": { "Package": "gtable", - "Version": "0.3.5", + "Version": "0.3.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -2015,7 +2027,7 @@ "lifecycle", "rlang" ], - "Hash": "e18861963cbc65a27736e02b3cd3c4a0" + "Hash": "b29cf3031f49b04ab9c852c912547eef" }, "gtools": { "Package": "gtools", @@ -2084,19 +2096,20 @@ }, "htmltools": { "Package": "htmltools", - "Version": "0.5.8.1", + "Version": "0.5.7", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "base64enc", "digest", + "ellipsis", "fastmap", "grDevices", "rlang", "utils" ], - "Hash": "81d371a9cc60640e74e4ab6ac46dcedc" + "Hash": "2d7b3857980e0e0d0a1fd6f11928ab0f" }, "htmlwidgets": { "Package": "htmlwidgets", @@ -2115,7 +2128,7 @@ }, "httpuv": { "Package": "httpuv", - "Version": "1.6.15", + "Version": "1.6.14", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -2126,7 +2139,7 @@ "promises", "utils" ], - "Hash": "d55aa087c47a63ead0f6fc10f8fa1ee0" + "Hash": "16abeb167dbf511f8cc0552efaf05bab" }, "httr": { "Package": "httr", @@ -2145,7 +2158,7 @@ }, "httr2": { "Package": "httr2", - "Version": "1.0.1", + "Version": "1.0.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -2162,11 +2175,11 @@ "vctrs", "withr" ], - "Hash": "03d741c92fda96d98c3a3f22494e3b4a" + "Hash": "e2b30f1fc039a0bab047dd52bb20ef71" }, "igraph": { "Package": "igraph", - "Version": "2.0.3", + "Version": "2.0.1.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -2182,10 +2195,9 @@ "pkgconfig", "rlang", "stats", - "utils", - "vctrs" + "utils" ], - "Hash": "c3b7d801d722e26e4cd888e042bf9af5" + "Hash": "fb2999614d40fe7fd61cf569b66a2dbc" }, "ini": { "Package": "ini", @@ -2286,7 +2298,7 @@ }, "knitr": { "Package": "knitr", - "Version": "1.46", + "Version": "1.45", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -2298,7 +2310,7 @@ "xfun", "yaml" ], - "Hash": "6e008ab1d696a5283c79765fa7b56b47" + "Hash": "1ec462871063897135c1bcbe0fc8f07d" }, "labeling": { "Package": "labeling", @@ -2373,7 +2385,7 @@ }, "lme4": { "Package": "lme4", - "Version": "1.1-35.3", + "Version": "1.1-35.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -2395,7 +2407,7 @@ "stats", "utils" ], - "Hash": "862f9d995f528f3051f524791955b20c" + "Hash": "07fb0c5b727b15b0ce40feb641498e4e" }, "lmerTest": { "Package": "lmerTest", @@ -2450,13 +2462,13 @@ }, "matrixStats": { "Package": "matrixStats", - "Version": "1.3.0", + "Version": "1.2.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "4b3ea27a19d669c0405b38134d89a9d1" + "Hash": "33a3ca9e732b57244d14f5d732ffc9eb" }, "memoise": { "Package": "memoise", @@ -2488,9 +2500,8 @@ }, "mia": { "Package": "mia", - "Version": "1.12.0", + "Version": "1.10.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "BiocGenerics", "BiocParallel", @@ -2522,7 +2533,7 @@ "utils", "vegan" ], - "Hash": "7fcccb9d988fad22dd0aa106e4a49710" + "Hash": "faf457d51512ccf79e0675ff331aa57e" }, "microbiome": { "Package": "microbiome", @@ -2637,9 +2648,8 @@ }, "multtest": { "Package": "multtest", - "Version": "2.60.0", + "Version": "2.58.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "Biobase", "BiocGenerics", @@ -2649,18 +2659,18 @@ "stats4", "survival" ], - "Hash": "5afaabf206052908b98e89799d51df36" + "Hash": "d4a74443ef3c2c1eb939c33e88954bae" }, "munsell": { "Package": "munsell", - "Version": "0.5.1", + "Version": "0.5.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "colorspace", "methods" ], - "Hash": "4fd8900853b746af55b81fda99da7695" + "Hash": "6dfe8bf774944bd5595785e3229d8771" }, "mvtnorm": { "Package": "mvtnorm", @@ -2675,7 +2685,7 @@ }, "nlme": { "Package": "nlme", - "Version": "3.1-163", + "Version": "3.1-164", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -2685,7 +2695,7 @@ "stats", "utils" ], - "Hash": "8d1938040a05566f4f7a14af4feadd6b" + "Hash": "a623a2239e642806158bc4dc3f51565d" }, "nloptr": { "Package": "nloptr", @@ -2721,13 +2731,13 @@ }, "openssl": { "Package": "openssl", - "Version": "2.1.2", + "Version": "2.1.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "askpass" ], - "Hash": "ea2475b073243d9d338aa8f086ce973e" + "Hash": "2a0dc8c6adfb6f032e4d4af82d258ab5" }, "osqp": { "Package": "osqp", @@ -2790,9 +2800,8 @@ }, "phyloseq": { "Package": "phyloseq", - "Version": "1.48.0", + "Version": "1.46.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "Biobase", "BiocGenerics", @@ -2813,7 +2822,7 @@ "scales", "vegan" ], - "Hash": "fb12c79b00278a3eab507631569ab57b" + "Hash": "ca2757208b49f05bff682a454e3c1c5c" }, "pillar": { "Package": "pillar", @@ -2846,7 +2855,7 @@ }, "pkgbuild": { "Package": "pkgbuild", - "Version": "1.4.4", + "Version": "1.4.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -2857,7 +2866,7 @@ "desc", "processx" ], - "Hash": "a29e8e134a460a01e0ca67a4763c595b" + "Hash": "c0143443203205e6a2760ce553dafc24" }, "pkgconfig": { "Package": "pkgconfig", @@ -2871,7 +2880,7 @@ }, "pkgdown": { "Package": "pkgdown", - "Version": "2.0.9", + "Version": "2.0.7", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -2897,7 +2906,7 @@ "xml2", "yaml" ], - "Hash": "8bf1151ed1a48328d71b937e651117a6" + "Hash": "16fa15449c930bf3a7761d3c68f8abf9" }, "pkgload": { "Package": "pkgload", @@ -2920,6 +2929,13 @@ ], "Hash": "876c618df5ae610be84356d5d7a5d124" }, + "plogr": { + "Package": "plogr", + "Version": "0.2.0", + "Source": "Repository", + "Repository": "CRAN", + "Hash": "09eb987710984fc2905c7129c7d85e65" + }, "plyr": { "Package": "plyr", "Version": "1.8.9", @@ -2960,7 +2976,7 @@ }, "processx": { "Package": "processx", - "Version": "3.8.4", + "Version": "3.8.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -2969,7 +2985,7 @@ "ps", "utils" ], - "Hash": "0c90a7d71988856bad2a2a45dd871bb9" + "Hash": "82d48b1aec56084d9438dbf98087a7e9" }, "profvis": { "Package": "profvis", @@ -3002,7 +3018,7 @@ }, "promises": { "Package": "promises", - "Version": "1.3.0", + "Version": "1.2.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -3014,7 +3030,7 @@ "rlang", "stats" ], - "Hash": "434cd5388a3979e74be5c219bcd6e77d" + "Hash": "0d8a15c9d000970ada1ab21405387dee" }, "proxy": { "Package": "proxy", @@ -3041,7 +3057,7 @@ }, "psych": { "Package": "psych", - "Version": "2.4.3", + "Version": "2.4.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -3054,7 +3070,7 @@ "parallel", "stats" ], - "Hash": "97169cbc91076f032a2d6df6f624f3ab" + "Hash": "e445e87c69650952cc58bb4cec6dd89c" }, "purrr": { "Package": "purrr", @@ -3083,14 +3099,14 @@ }, "ragg": { "Package": "ragg", - "Version": "1.3.0", + "Version": "1.2.7", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "systemfonts", "textshaping" ], - "Hash": "082e1a198e3329d571f4448ef0ede4bc" + "Hash": "90a1b8b7e518d7f90480d56453b4d062" }, "rappdirs": { "Package": "rappdirs", @@ -3107,11 +3123,11 @@ "Version": "0.0.0.9000", "Source": "GitHub", "RemoteType": "github", - "RemoteHost": "api.github.com", "RemoteUsername": "paleolimbot", "RemoteRepo": "rbbt", "RemoteRef": "master", "RemoteSha": "ec1ebe1e9b7e60bc4523e6cb2ca47f73a9cbfba3", + "RemoteHost": "api.github.com", "Requirements": [ "R", "clipr", @@ -3216,7 +3232,7 @@ }, "remotes": { "Package": "remotes", - "Version": "2.5.0", + "Version": "2.4.2.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -3226,17 +3242,17 @@ "tools", "utils" ], - "Hash": "3ee025083e66f18db6cf27b56e23e141" + "Hash": "63d15047eb239f95160112bcadc4fcb9" }, "renv": { "Package": "renv", - "Version": "1.0.7", + "Version": "1.0.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "utils" ], - "Hash": "397b7b2a265bc5a7a06852524dabae20" + "Hash": "41b847654f567341725473431dd0d5ab" }, "reshape2": { "Package": "reshape2", @@ -3253,26 +3269,26 @@ }, "rhdf5": { "Package": "rhdf5", - "Version": "2.48.0", + "Version": "2.46.1", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", + "Repository": "Bioconductor 3.18", "Requirements": [ "R", "Rhdf5lib", + "S4Vectors", "methods", "rhdf5filters" ], - "Hash": "74d8c5aeb96d090ce8efc9ffd16afa2b" + "Hash": "b0a244022c3427cd8213c33804c6b5de" }, "rhdf5filters": { "Package": "rhdf5filters", - "Version": "1.16.0", + "Version": "1.14.1", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "Rhdf5lib" ], - "Hash": "99e15369f8fb17dc188377234de13fc6" + "Hash": "d27a2f6a89def6388fad5b0aae026220" }, "rlang": { "Package": "rlang", @@ -3287,7 +3303,7 @@ }, "rmarkdown": { "Package": "rmarkdown", - "Version": "2.26", + "Version": "2.25", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -3300,13 +3316,14 @@ "jsonlite", "knitr", "methods", + "stringr", "tinytex", "tools", "utils", "xfun", "yaml" ], - "Hash": "9b148e7f95d33aac01f31282d49e4f44" + "Hash": "d65e35823c817f09f4de424fcdfa812a" }, "rngtools": { "Package": "rngtools", @@ -3402,10 +3419,10 @@ }, "rstudioapi": { "Package": "rstudioapi", - "Version": "0.16.0", + "Version": "0.15.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "96710351d642b70e8f02ddeb237c46a7" + "Hash": "5564500e25cffad9e22244ced1379887" }, "rsvd": { "Package": "rsvd", @@ -3445,7 +3462,7 @@ }, "sass": { "Package": "sass", - "Version": "0.4.9", + "Version": "0.4.8", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -3455,7 +3472,7 @@ "rappdirs", "rlang" ], - "Hash": "d53dbfddf695303ea4ad66f86e99b95d" + "Hash": "168f9353c76d4c4b0a0bbf72e2c2d035" }, "scales": { "Package": "scales", @@ -3479,9 +3496,8 @@ }, "scater": { "Package": "scater", - "Version": "1.32.0", + "Version": "1.30.1", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "BiocGenerics", "BiocNeighbors", @@ -3510,7 +3526,7 @@ "uwot", "viridis" ], - "Hash": "4a6eb8ab8a2b926fe67cf83aa731a3df" + "Hash": "d92b4aa892e1f28148ce3ecad8e63cfb" }, "scs": { "Package": "scs", @@ -3524,9 +3540,8 @@ }, "scuttle": { "Package": "scuttle", - "Version": "1.14.0", + "Version": "1.12.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "BiocGenerics", "BiocParallel", @@ -3543,7 +3558,7 @@ "stats", "utils" ], - "Hash": "6d94b72071aefd6e8b041c34ee83ebd0" + "Hash": "1412c4b6dfd8de528e1101e493e66a02" }, "sessioninfo": { "Package": "sessioninfo", @@ -3560,7 +3575,7 @@ }, "shiny": { "Package": "shiny", - "Version": "1.8.1.1", + "Version": "1.8.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -3570,6 +3585,7 @@ "cachem", "commonmark", "crayon", + "ellipsis", "fastmap", "fontawesome", "glue", @@ -3589,7 +3605,7 @@ "withr", "xtable" ], - "Hash": "54b26646816af9960a4c64d8ceec75d6" + "Hash": "3a1f41807d648a908e3c7f0334bf85e6" }, "sitmo": { "Package": "sitmo", @@ -3625,7 +3641,7 @@ }, "sp": { "Package": "sp", - "Version": "2.1-4", + "Version": "2.1-3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -3638,13 +3654,12 @@ "stats", "utils" ], - "Hash": "75940133cca2e339afce15a586f85b11" + "Hash": "1a0cc0cec2915700e63fd0921085cf6a" }, "sparseMatrixStats": { "Package": "sparseMatrixStats", - "Version": "1.16.0", + "Version": "1.14.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "Matrix", "MatrixGenerics", @@ -3652,7 +3667,7 @@ "matrixStats", "methods" ], - "Hash": "7e500a5a527460ca0406473bdcade286" + "Hash": "49383d0f6c6152ff7cb594f254c23cc8" }, "stringi": { "Package": "stringi", @@ -3686,7 +3701,7 @@ }, "survival": { "Package": "survival", - "Version": "3.5-8", + "Version": "3.5-7", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -3698,7 +3713,7 @@ "stats", "utils" ], - "Hash": "184d7799bca4ba8c3be72ea396f4b9a3" + "Hash": "b8e943d262c3da0b0febd3e04517c197" }, "svglite": { "Package": "svglite", @@ -3721,14 +3736,14 @@ }, "systemfonts": { "Package": "systemfonts", - "Version": "1.0.6", + "Version": "1.0.5", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "cpp11" ], - "Hash": "6d538cff441f0f1f36db2209ac7495ac" + "Hash": "15b594369e70b975ba9f064295983499" }, "tensorA": { "Package": "tensorA", @@ -3743,7 +3758,7 @@ }, "testthat": { "Package": "testthat", - "Version": "3.2.1.1", + "Version": "3.2.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -3768,7 +3783,7 @@ "waldo", "withr" ], - "Hash": "3f6e7e5e2220856ff865e4834766bf2b" + "Hash": "4767a686ebe986e6cb01d075b3f09729" }, "textshaping": { "Package": "textshaping", @@ -3826,7 +3841,7 @@ }, "tidyselect": { "Package": "tidyselect", - "Version": "1.2.1", + "Version": "1.2.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -3838,7 +3853,7 @@ "vctrs", "withr" ], - "Hash": "829f27b9c4919c16b593794a6344d6c0" + "Hash": "79540e5fcd9e0435af547d885f184fd5" }, "tidytree": { "Package": "tidytree", @@ -3864,19 +3879,18 @@ }, "tinytex": { "Package": "tinytex", - "Version": "0.50", + "Version": "0.49", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "xfun" ], - "Hash": "be7a76845222ad20adb761f462eed3ea" + "Hash": "5ac22900ae0f386e54f1c307eca7d843" }, "treeio": { "Package": "treeio", - "Version": "1.28.0", + "Version": "1.26.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", "Requirements": [ "R", "ape", @@ -3888,10 +3902,9 @@ "stats", "tibble", "tidytree", - "utils", - "yulab.utils" + "utils" ], - "Hash": "9e0a0b700763836cd36cb3a49be5a15d" + "Hash": "a09203806aa0bc49965563ca7016620e" }, "tzdb": { "Package": "tzdb", @@ -3920,7 +3933,7 @@ }, "usethis": { "Package": "usethis", - "Version": "2.2.3", + "Version": "2.2.2", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -3947,7 +3960,7 @@ "withr", "yaml" ], - "Hash": "d524fd42c517035027f866064417d7e6" + "Hash": "60e51f0b94d0324dc19e44110098fa9f" }, "utf8": { "Package": "utf8", @@ -3961,13 +3974,12 @@ }, "uwot": { "Package": "uwot", - "Version": "0.2.2", + "Version": "0.1.16", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "FNN", "Matrix", - "RSpectra", "Rcpp", "RcppAnnoy", "RcppProgress", @@ -3975,7 +3987,7 @@ "irlba", "methods" ], - "Hash": "f693a0ca6d34b02eb432326388021805" + "Hash": "252deaa1c1d6d3da6946694243781ea3" }, "vctrs": { "Package": "vctrs", @@ -4106,15 +4118,14 @@ }, "xfun": { "Package": "xfun", - "Version": "0.43", + "Version": "0.41", "Source": "Repository", "Repository": "CRAN", "Requirements": [ - "grDevices", "stats", "tools" ], - "Hash": "ab6371d8653ce5f2f9290f4ec7b42a8e" + "Hash": "460a5e0fe46a80ef87424ad216028014" }, "xml2": { "Package": "xml2", @@ -4131,14 +4142,14 @@ }, "xopen": { "Package": "xopen", - "Version": "1.0.1", + "Version": "1.0.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "processx" ], - "Hash": "423df1e86d5533fcb73c6b02b4923b49" + "Hash": "6c85f015dee9cc7710ddd20f86881f58" }, "xtable": { "Package": "xtable", @@ -4185,10 +4196,9 @@ }, "zlibbioc": { "Package": "zlibbioc", - "Version": "1.50.0", + "Version": "1.48.0", "Source": "Bioconductor", - "Repository": "Bioconductor 3.19", - "Hash": "3db02e3c460e1c852365df117a2b441b" + "Hash": "50ad6f7b0baaaccf1a387d2f1ecce911" }, "zoo": { "Package": "zoo", diff --git a/renv/activate.R b/renv/activate.R index d13f993..cb5401f 100644 --- a/renv/activate.R +++ b/renv/activate.R @@ -2,13 +2,11 @@ local({ # the requested version of renv - version <- "1.0.7" + version <- "1.0.3" attr(version, "sha") <- NULL # the project directory - project <- Sys.getenv("RENV_PROJECT") - if (!nzchar(project)) - project <- getwd() + project <- getwd() # use start-up diagnostics if enabled diagnostics <- Sys.getenv("RENV_STARTUP_DIAGNOSTICS", unset = "FALSE") @@ -33,14 +31,6 @@ 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( @@ -60,22 +50,9 @@ local({ }) - # 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()) - } - + if (!enabled) return(FALSE) - } - # avoid recursion if (identical(getOption("renv.autoloader.running"), TRUE)) { warning("ignoring recursive attempt to run renv autoloader") @@ -131,21 +108,6 @@ 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 } @@ -648,9 +610,6 @@ 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()) @@ -842,23 +801,24 @@ local({ # the loaded version of renv doesn't match the requested version; # give the user instructions on how to proceed - dev <- identical(description[["RemoteType"]], "github") - remote <- if (dev) + remote <- if (!is.null(description[["RemoteSha"]])) { 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 = if (dev) description[["RemoteSha"]] + sha = description[["RemoteSha"]] ) - 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. - ") + 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" + ) catf(fmt, friendly, renv_bootstrap_version_friendly(version), remote) FALSE @@ -1081,7 +1041,7 @@ local({ # if jsonlite is loaded, use that instead if ("jsonlite" %in% loadedNamespaces()) { - json <- tryCatch(renv_json_read_jsonlite(file, text), error = identity) + json <- catch(renv_json_read_jsonlite(file, text)) if (!inherits(json, "error")) return(json) @@ -1090,7 +1050,7 @@ local({ } # otherwise, fall back to the default JSON reader - json <- tryCatch(renv_json_read_default(file, text), error = identity) + json <- catch(renv_json_read_default(file, text)) if (!inherits(json, "error")) return(json) @@ -1103,14 +1063,14 @@ local({ } renv_json_read_jsonlite <- function(file = NULL, text = NULL) { - text <- paste(text %||% readLines(file, warn = FALSE), collapse = "\n") + text <- paste(text %||% read(file), 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 %||% readLines(file, warn = FALSE), collapse = "\n") + text <- paste(text %||% read(file), collapse = "\n") pattern <- '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]' locs <- gregexpr(pattern, text, perl = TRUE)[[1]] @@ -1158,14 +1118,14 @@ local({ map <- as.list(map) # remap strings in object - remapped <- renv_json_read_remap(json, map) + remapped <- renv_json_remap(json, map) # evaluate eval(remapped, envir = baseenv()) } - renv_json_read_remap <- function(json, map) { + renv_json_remap <- function(json, map) { # fix names if (!is.null(names(json))) { @@ -1192,7 +1152,7 @@ local({ # recurse if (is.recursive(json)) { for (i in seq_along(json)) { - json[i] <- list(renv_json_read_remap(json[[i]], map)) + json[i] <- list(renv_json_remap(json[[i]], map)) } }