From f44d7ac573b8c553b3a5b159692a6cc9c56e941f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vilmantas=20G=C4=97g=C5=BEna?= Date: Mon, 27 May 2024 19:47:56 +0300 Subject: [PATCH 1/7] Fix version number data type --- R/dictionaries.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/dictionaries.R b/R/dictionaries.R index 17030bc7..396d9c18 100644 --- a/R/dictionaries.R +++ b/R/dictionaries.R @@ -94,7 +94,7 @@ open_rstudio_internal_dictionaries_dir <- function() { rstudio_install_spellcheck_dictionaries <- function(secure = TRUE) { - if (rstudioapi::isAvailable(version_needed = 1.3)) { + if (rstudioapi::isAvailable(version_needed = "1.3")) { dic_dir <- get_path_rstudio_config_dir("dictionaries/languages-system") .rs.downloadAllDictionaries(targetDir = dic_dir, secure = secure) } else { From de0f779d1c8d37830597c4b2060805ae7df70527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vilmantas=20G=C4=97g=C5=BEna?= Date: Mon, 27 May 2024 19:48:20 +0300 Subject: [PATCH 2/7] Remove not used option --- inst/rs-settings/rstudio-prefs--rstudio-default.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/inst/rs-settings/rstudio-prefs--rstudio-default.json b/inst/rs-settings/rstudio-prefs--rstudio-default.json index 1b6b0947..13e94357 100644 --- a/inst/rs-settings/rstudio-prefs--rstudio-default.json +++ b/inst/rs-settings/rstudio-prefs--rstudio-default.json @@ -146,7 +146,9 @@ "latex_shell_escape" : false, "launcher_jobs_sort" : "recorded", "limit_visible_console" : false, +```{python} "line_ending_conversion" : "native", +``` "load_workspace" : true, "margin_column" : 80, "memory_query_interval_seconds" : 10, @@ -249,7 +251,6 @@ "ui_language" : "en", "use_dataimport" : true, "use_devtools" : true, - "use_internet2" : true, "use_newlines_in_makefiles" : true, "use_publish_ca_bundle" : false, "use_roxygen" : false, From d1771a6a6c764090889f2ed13249a9a33cbc96ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vilmantas=20G=C4=97g=C5=BEna?= Date: Mon, 27 May 2024 19:48:39 +0300 Subject: [PATCH 3/7] Update programs-required-version.txt --- inst/install-r/programs-required-version.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inst/install-r/programs-required-version.txt b/inst/install-r/programs-required-version.txt index 1bcde54e..f3176f30 100644 --- a/inst/install-r/programs-required-version.txt +++ b/inst/install-r/programs-required-version.txt @@ -1,6 +1,6 @@ --- title: "Minimal required versions of programs" -date: 2023-08-24 +date: 2024-05-27 notes: "" @@ -9,7 +9,7 @@ notes: "" --- # This text must be in line 10 ----------------------------------------------- program | required_version | ignore | notes_version -R | 4.3.1 | FALSE | -RStudio | 2023.06.2 | FALSE | For 32-bit systems v 1.1.463 -Quarto | 1.4.330 | FALSE | +R | 4.3.3 | FALSE | +RStudio | 2023.12.1 | FALSE | For 32-bit systems v 1.1.463 +Quarto | 1.4.554 | FALSE | From f8127861aadf294039154aad3b0f038e76b477ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vilmantas=20G=C4=97g=C5=BEna?= Date: Mon, 27 May 2024 19:48:50 +0300 Subject: [PATCH 4/7] Update pkgs-required-version.txt --- inst/install-r/pkgs-required-version.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inst/install-r/pkgs-required-version.txt b/inst/install-r/pkgs-required-version.txt index e72e1056..221d41d8 100644 --- a/inst/install-r/pkgs-required-version.txt +++ b/inst/install-r/pkgs-required-version.txt @@ -1,6 +1,6 @@ --- title: "Minimal required versions of packages" -date: 2023-08-08 +date: 2024-05-27 notes: "" @@ -12,8 +12,8 @@ package | required_version | ignore | notes_version addin.tools | 0.0.10 | FALSE | - addins.rmd | 0.0.14 | FALSE | - addins.rs | 0.0.12 | FALSE | - -backup.tools | 0.0.1 | FALSE | - -bio | 0.2.2 | FALSE | - +backup.tools | 0.0.3 | FALSE | - +bio | 0.2.5 | FALSE | - BiocManager | 1.30.20 | FALSE | - blogdown | 1.9 | FALSE | - bookdown | 0.32 | FALSE | - @@ -40,7 +40,7 @@ fs | 1.5.2 | FALSE | - ggforce | 0.4.1 | FALSE | - gghighlight | 0.4.0 | FALSE | - ggmosaic | 0.3.3 | FALSE | - -ggplot2 | 3.4.2 | FALSE | - +ggplot2 | 3.5.1 | FALSE | - ggpubr | 0.6.0 | FALSE | - ggstatsplot | 0.10. | FALSE | - ggtext | 0.1.1 | FALSE | - From 9b25bd6028c959ff9e175ef7e90baf82ab050996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vilmantas=20G=C4=97g=C5=BEna?= Date: Mon, 27 May 2024 19:49:00 +0300 Subject: [PATCH 5/7] Update DESCRIPTION --- DESCRIPTION | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index d5569e05..08b76421 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: bio Type: Package -Title: Resources Manager for BS-2023 -Version: 0.2.3 -Date: 2023-08-24 +Title: Resources Manager for R, RStudio and Related Software +Version: 0.2.5 +Date: 2024-05-27 Authors@R: person("Vilmantas", "Gegzna", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-9500-5167"), From 5da606ab2bfbbbb2284e69adc2314b905871c6e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vilmantas=20G=C4=97g=C5=BEna?= Date: Mon, 27 May 2024 19:57:52 +0300 Subject: [PATCH 6/7] Update programs-required-version.txt --- inst/install-r/programs-required-version.txt | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/inst/install-r/programs-required-version.txt b/inst/install-r/programs-required-version.txt index 69286cd2..9710cf9f 100644 --- a/inst/install-r/programs-required-version.txt +++ b/inst/install-r/programs-required-version.txt @@ -1,10 +1,6 @@ --- title: "Minimal required versions of programs" -<<<<<<< HEAD date: 2024-05-27 -======= -date: 2024-02-08 ->>>>>>> master notes: "" @@ -13,13 +9,8 @@ notes: "" --- # This text must be in line 10 ----------------------------------------------- program | required_version | ignore | notes_version -<<<<<<< HEAD R | 4.3.3 | FALSE | RStudio | 2023.12.1 | FALSE | For 32-bit systems v 1.1.463 Quarto | 1.4.554 | FALSE | -======= -R | 4.3.2 | FALSE | -RStudio | 2023.12.1 | FALSE | For 32-bit systems v 1.1.463 -Quarto | 1.4.549 | FALSE | ->>>>>>> master + From 26a1391961b5665ee1536b1be52c423fb4d66b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vilmantas=20G=C4=97g=C5=BEna?= Date: Mon, 27 May 2024 20:00:17 +0300 Subject: [PATCH 7/7] Update rstudio-prefs--rstudio-default.json --- inst/rs-settings/rstudio-prefs--rstudio-default.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/inst/rs-settings/rstudio-prefs--rstudio-default.json b/inst/rs-settings/rstudio-prefs--rstudio-default.json index 13e94357..9fa9447f 100644 --- a/inst/rs-settings/rstudio-prefs--rstudio-default.json +++ b/inst/rs-settings/rstudio-prefs--rstudio-default.json @@ -146,9 +146,7 @@ "latex_shell_escape" : false, "launcher_jobs_sort" : "recorded", "limit_visible_console" : false, -```{python} "line_ending_conversion" : "native", -``` "load_workspace" : true, "margin_column" : 80, "memory_query_interval_seconds" : 10,