From 530b0043f655f6ca2c47af2b3c14e0f256a56a29 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Mon, 23 Sep 2024 10:13:57 +0200 Subject: [PATCH 01/13] vbump pkgdown --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 35a414a..48cdca9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -20,7 +20,7 @@ Imports: roxygen2 (>= 7.1.1), stringr (>= 0.4) Suggests: - pkgdown (>= 1.2.0), + pkgdown (>= 1.4.0), testthat (>= 3.0.4), withr (>= 2.4.3) Config/Needs/verdepcheck:tidyverse/glue, jeroen/jsonlite, From 7d1ab3f1e3318d12c9d77ddfc250b78feb65baa1 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Mon, 23 Sep 2024 10:40:46 +0200 Subject: [PATCH 02/13] vbump pkgdown --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 48cdca9..9bd8df9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -20,7 +20,7 @@ Imports: roxygen2 (>= 7.1.1), stringr (>= 0.4) Suggests: - pkgdown (>= 1.4.0), + pkgdown (>= 1.5.0), testthat (>= 3.0.4), withr (>= 2.4.3) Config/Needs/verdepcheck:tidyverse/glue, jeroen/jsonlite, From cb440251f75fedc1394094f7453f7ac178f9627f Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Mon, 23 Sep 2024 10:53:18 +0200 Subject: [PATCH 03/13] vbump pkgdown --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index e121089..cc705c4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -20,7 +20,7 @@ Imports: roxygen2 (>= 7.1.1), stringr (>= 0.4) Suggests: - pkgdown (>= 1.5.0), + pkgdown (>= 1.5.1), testthat (>= 3.0.4), withr (>= 2.4.3) Config/Needs/verdepcheck: tidyverse/glue, jeroen/jsonlite, From 329ab1c00de5e58c2bace3bda3b594be463aad15 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Mon, 23 Sep 2024 11:07:35 +0200 Subject: [PATCH 04/13] vbump pkgdown --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index cc705c4..4ac2fe9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -20,7 +20,7 @@ Imports: roxygen2 (>= 7.1.1), stringr (>= 0.4) Suggests: - pkgdown (>= 1.5.1), + pkgdown (>= 1.6.1), testthat (>= 3.0.4), withr (>= 2.4.3) Config/Needs/verdepcheck: tidyverse/glue, jeroen/jsonlite, From 9b81d8260ea73d8a1fb6b6dea19a73080719db34 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Mon, 23 Sep 2024 11:15:23 +0200 Subject: [PATCH 05/13] vbump pkgdown --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 4ac2fe9..233c5b2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -20,7 +20,7 @@ Imports: roxygen2 (>= 7.1.1), stringr (>= 0.4) Suggests: - pkgdown (>= 1.6.1), + pkgdown (>= 2.0.0), testthat (>= 3.0.4), withr (>= 2.4.3) Config/Needs/verdepcheck: tidyverse/glue, jeroen/jsonlite, From 52bc0085056632cdba9429bba730407e34089a04 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Mon, 23 Sep 2024 11:23:11 +0200 Subject: [PATCH 06/13] vbump roxygen2 --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 233c5b2..2621173 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -17,7 +17,7 @@ Imports: glue, jsonlite (>= 0.9.4), lzstring, - roxygen2 (>= 7.1.1), + roxygen2 (>= 7.1.2), stringr (>= 0.4) Suggests: pkgdown (>= 2.0.0), From ae3992e2c699e5c58d2fabd3309719925cd4bb9a Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Mon, 23 Sep 2024 11:30:45 +0200 Subject: [PATCH 07/13] vbump roxygen2 --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 2621173..74af2a0 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -17,7 +17,7 @@ Imports: glue, jsonlite (>= 0.9.4), lzstring, - roxygen2 (>= 7.1.2), + roxygen2 (>= 7.2.0), stringr (>= 0.4) Suggests: pkgdown (>= 2.0.0), From 5394e30a51cd8164dc7de5d0db97ee900b4bf58f Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:05:55 +0200 Subject: [PATCH 08/13] support older roxygen2 --- R/tag_examplesShinylive.R | 2 +- tests/testthat/test-tag_examplesShinylive.R | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/R/tag_examplesShinylive.R b/R/tag_examplesShinylive.R index 1ffe962..75ee6cd 100644 --- a/R/tag_examplesShinylive.R +++ b/R/tag_examplesShinylive.R @@ -132,7 +132,7 @@ roxy_tag_parse.roxy_tag_examplesShinylive <- function(x) { } # not elegant but this is the most efficient way to access sibling tags - tokens <- get("tokens", envir = parent.frame(3L)) + tokens <- dynGet("tokens") tags_examples <- Filter(function(x) x$tag %in% c("examples", "examplesIf"), tokens) diff --git a/tests/testthat/test-tag_examplesShinylive.R b/tests/testthat/test-tag_examplesShinylive.R index ace91b5..32a17cf 100644 --- a/tests/testthat/test-tag_examplesShinylive.R +++ b/tests/testthat/test-tag_examplesShinylive.R @@ -1,4 +1,5 @@ test_that("examplesShinylive tag - errors - missing @examples", { + skip_if_not(packageVersion("roxygen2") >= "7.3.0") text <- " #' This is a title #' @@ -240,6 +241,7 @@ test_that("examplesShinylive tag - keywords - {{tags_examples}}", { }) test_that("examplesShinylive tag - keywords - error when parsing with glue", { + skip_if_not(packageVersion("roxygen2") >= "7.3.0") text <- " #' This is a title #' From 4ab8bf2a8e40e62998678781ae42d6defb69b1ba Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:16:16 +0200 Subject: [PATCH 09/13] vbump testthat --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 74af2a0..d11435d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -21,7 +21,7 @@ Imports: stringr (>= 0.4) Suggests: pkgdown (>= 2.0.0), - testthat (>= 3.0.4), + testthat (>= 3.1.5), withr (>= 2.4.3) Config/Needs/verdepcheck: tidyverse/glue, jeroen/jsonlite, lzstring=parmsam/lzstring-r, r-lib/roxygen2, tidyverse/stringr, From e6c50fdea71b95efd1b4d7e9198be792fb966693 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:24:54 +0200 Subject: [PATCH 10/13] vbump jsonlite --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index d11435d..9b4e52a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -15,7 +15,7 @@ Depends: R (>= 4.0) Imports: glue, - jsonlite (>= 0.9.4), + jsonlite (>= 1.8.3), lzstring, roxygen2 (>= 7.2.0), stringr (>= 0.4) From fd0ace022df8e3d1130eecdc4d620b30ea06c038 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:33:45 +0200 Subject: [PATCH 11/13] vbump jsonlite --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 9b4e52a..f6f6346 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -15,7 +15,7 @@ Depends: R (>= 4.0) Imports: glue, - jsonlite (>= 1.8.3), + jsonlite (>= 1.8.4), lzstring, roxygen2 (>= 7.2.0), stringr (>= 0.4) From 218cc675c7fbd38e169a509b1e52a7cd100f9c00 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:39:51 +0200 Subject: [PATCH 12/13] vbump jsonlite --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index f6f6346..6b7b367 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -15,7 +15,7 @@ Depends: R (>= 4.0) Imports: glue, - jsonlite (>= 1.8.4), + jsonlite (>= 1.8.5), lzstring, roxygen2 (>= 7.2.0), stringr (>= 0.4) From ab7ed0f51b3ef2cbf2caf36d727e363aac40fce1 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:47:01 +0200 Subject: [PATCH 13/13] vbump jsonlite --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 6b7b367..2857e1c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -15,7 +15,7 @@ Depends: R (>= 4.0) Imports: glue, - jsonlite (>= 1.8.5), + jsonlite (>= 1.8.6), lzstring, roxygen2 (>= 7.2.0), stringr (>= 0.4)