v0.2.2.3

Merge pull request #34 from mokymai/devel
mokymai · Aug 24, 2023 · 5400fb8 · 5400fb8
2 parents 6bf5104 + 6d2836d
commit 5400fb8
Show file tree

Hide file tree

Showing 7 changed files with 488 additions and 356 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: bio
 Type: Package
 Title: Resources Manager for BS-2023
-Version: 0.2.2.2
-Date: 2023-08-08
+Version: 0.2.2.3
+Date: 2023-08-24
 Authors@R: 
     person("Vilmantas", "Gegzna", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-9500-5167"),
@@ -22,7 +22,7 @@ RoxygenNote: 7.2.3
 Additional_repositories:
   https://mokymai.github.io/download/
 Imports:
-  backup.tools,
+  backup.tools (>= 0.0.3),
   checkmate,
   clipr,
   crayon,

diff --git a/R/settings--preferences.R b/R/settings--preferences.R
@@ -124,7 +124,7 @@ rstudio_reset_user_settings <- function(to, backup = TRUE, ask = TRUE) {
     "bio-dark-blue" = ,
     "bio-black" = {
       # Change the default dir, if default UI preferences change
-      fs::dir_create("~/R/darbinis", recurse = TRUE)
+      fs::dir_create("~/R/main", recurse = TRUE)
 
       file_default <- get_path_rstudio_config_file(which = "bio")
       success <- rstudio_set_preferences(file_default)

diff --git a/R/settings.R b/R/settings.R
@@ -47,7 +47,7 @@ restriction_status <- function(ignore_ip = getOption("bio.ignore_ip", FALSE),
 #' 3) Closes unnecessary windows
 #' 4) Resets custom key bindings to "bio-default"
 #' 5) Resets R Markdown and R snippets to defaults in package "snippets"
-#' 6) Creates folder "~/R/darbinis" and starts using it as working directory
+#' 6) Creates folder "~/R/default" and starts using it as working directory
 #'    when no project is used.
 #' 7) Clears (if possible)/creates folder "BS-pratybos" on Desktop.
 #'
@@ -95,7 +95,7 @@ rstudio_reset_gmc <- function(..., force_update_dictionaries = FALSE) {
   rstudioapi::executeCommand("setWorkingDirToProjectDir", quiet = TRUE)
 
   # Create/Clean directories
-  fs::dir_create(fs::path_expand_r("~/R/darbinis"))
+  fs::dir_create(fs::path_expand_r("~/R/main"))
 
   bs_folder <- fs::path_expand("~/Desktop/BS-pratybos/")
   try(fs::dir_delete(bs_folder), silent = TRUE)

diff --git 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-07-28
+date:  2023-08-24
 notes: ""
 
 
@@ -10,6 +10,6 @@ notes: ""
 # This text must be in line 10 -----------------------------------------------
 program                     | required_version | ignore | notes_version
 R                           | 4.3.1            | FALSE  |
-RStudio                     | 2023.06.0        | FALSE  | For 32-bit systems v 1.1.463
-Quarto                      | 1.4.268          | FALSE  |
+RStudio                     | 2023.06.2        | FALSE  | For 32-bit systems v 1.1.463
+Quarto                      | 1.4.330          | FALSE  |
 
diff --git a/inst/rs-settings/rstudio-prefs--bio-2.json b/inst/rs-settings/rstudio-prefs--bio-2.json
@@ -56,7 +56,6 @@
     "highlight_web_link"                          : true,
     "initial_working_directory"                   : "~/R/darbinis",
     "insert_matching"                             : true,
-    "insert_native_pipe_operator"                 : false,
     "insert_native_pipe_operator"                 : true,
     "insert_parens_after_function_completion"     : true,
     "insert_spaces_around_equals"                 : true,

diff --git a/inst/rs-settings/rstudio-prefs--bio-default.json b/inst/rs-settings/rstudio-prefs--bio-default.json
diff --git a/inst/rs-settings/rstudio-prefs--rstudio-default.json b/inst/rs-settings/rstudio-prefs--rstudio-default.json