upkeep 2025 (#189)

Author: thomasp85

.Rbuildignore

@@ -24,3 +24,5 @@
 ^.*\.vscode$
 ^compile_commands\.json$
 ^\.cache$
+^[\.]?air\.toml$
+^\.vscode$

.github/workflows/R-CMD-check.yaml

@@ -8,9 +8,10 @@ on:
   push:
     branches: [main, master]
   pull_request:
-    branches: [main, master]
 
-name: R-CMD-check
+name: R-CMD-check.yaml
+
+permissions: read-all
 
 jobs:
   R-CMD-check:
@@ -23,24 +24,24 @@ jobs:
       matrix:
         config:
           - {os: macos-latest,   r: 'release'}
-          - {os: windows-latest, r: 'devel'}
-          - {os: windows-latest, r: '4.4'}
-          - {os: windows-latest, r: '4.3'}
-          - {os: windows-latest, r: '4.2'}          
-          - {os: windows-latest, r: '4.1'}
-          - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
-          - {os: ubuntu-latest,   r: 'release'}
-          - {os: ubuntu-latest,   r: 'oldrel-1'}
-          - {os: ubuntu-latest,   r: 'oldrel-2'}
-          - {os: ubuntu-latest,   r: 'oldrel-3'}
-          - {os: ubuntu-latest,   r: 'oldrel-4'}
+
+          - {os: windows-latest, r: 'release'}
+          # use 4.0 or 4.1 to check with rtools40's older compiler
+          - {os: windows-latest, r: 'oldrel-4'}
+
+          - {os: ubuntu-latest,  r: 'devel', http-user-agent: 'release'}
+          - {os: ubuntu-latest,  r: 'release'}
+          - {os: ubuntu-latest,  r: 'oldrel-1'}
+          - {os: ubuntu-latest,  r: 'oldrel-2'}
+          - {os: ubuntu-latest,  r: 'oldrel-3'}
+          - {os: ubuntu-latest,  r: 'oldrel-4'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       R_KEEP_PKG_SOURCE: yes
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -58,3 +59,4 @@ jobs:
       - uses: r-lib/actions/check-r-package@v2
         with:
           upload-snapshots: true
+          build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'

.github/workflows/pkgdown.yaml

@@ -4,12 +4,13 @@ on:
   push:
     branches: [main, master]
   pull_request:
-    branches: [main, master]
   release:
     types: [published]
   workflow_dispatch:
 
-name: pkgdown
+name: pkgdown.yaml
+
+permissions: read-all
 
 jobs:
   pkgdown:
@@ -19,8 +20,10 @@ jobs:
       group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -39,7 +42,7 @@ jobs:
 
       - name: Deploy to GitHub pages 🚀
         if: github.event_name != 'pull_request'
-        uses: JamesIves/github-pages-deploy-action@v4.4.1
+        uses: JamesIves/github-pages-deploy-action@v4.5.0
         with:
           clean: false
           branch: gh-pages

.github/workflows/pr-commands.yaml

@@ -4,7 +4,9 @@ on:
   issue_comment:
     types: [created]
 
-name: Commands
+name: pr-commands.yaml
+
+permissions: read-all
 
 jobs:
   document:
@@ -13,8 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/pr-fetch@v2
         with:
@@ -50,8 +54,10 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/pr-fetch@v2
         with:

.github/workflows/test-coverage.yaml

@@ -4,9 +4,10 @@ on:
   push:
     branches: [main, master]
   pull_request:
-    branches: [main, master]
 
-name: test-coverage
+name: test-coverage.yaml
+
+permissions: read-all
 
 jobs:
   test-coverage:
@@ -15,36 +16,47 @@ jobs:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-r@v2
         with:
           use-public-rspm: true
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: any::covr
+          extra-packages: any::covr, any::xml2
           needs: coverage
 
       - name: Test coverage
         run: |
-          covr::codecov(
+          cov <- covr::package_coverage(
             quiet = FALSE,
             clean = FALSE,
-            install_path = file.path(Sys.getenv("RUNNER_TEMP"), "package")
+            install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
           )
+          print(cov)
+          covr::to_cobertura(cov)
         shell: Rscript {0}
 
+      - uses: codecov/codecov-action@v5
+        with:
+          # Fail if error if not on PR, or if on PR and token is given
+          fail_ci_if_error: ${{ github.event_name != 'pull_request' || secrets.CODECOV_TOKEN }}
+          files: ./cobertura.xml
+          plugins: noop
+          disable_search: true
+          token: ${{ secrets.CODECOV_TOKEN }}
+
       - name: Show testthat output
         if: always()
         run: |
           ## --------------------------------------------------------------------
-          find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true
+          find '${{ runner.temp }}/package' -name 'testthat.Rout*' -exec cat '{}' \; || true
         shell: bash
 
       - name: Upload test results
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage-test-failures
           path: ${{ runner.temp }}/package

DESCRIPTION

@@ -13,7 +13,8 @@ Authors@R: c(
            comment = "Contributor to AGG"),
     person("Spencer", "Garrett", role = "ctb",
            comment = "Contributor to AGG"),
-    person("Posit, PBC", role = c("cph", "fnd"))
+    person("Posit Software, PBC", role = c("cph", "fnd"),
+           comment = c(ROR = "03wc8by49"))
   )
 Maintainer: Thomas Lin Pedersen <thomas.pedersen@posit.co>
 Description: Anti-Grain Geometry (AGG) is a high-quality and
@@ -23,22 +24,23 @@ Description: Anti-Grain Geometry (AGG) is a high-quality and
 License: MIT + file LICENSE
 URL: https://ragg.r-lib.org, https://github.com/r-lib/ragg
 BugReports: https://github.com/r-lib/ragg/issues
-Imports: 
+Imports:
     systemfonts (>= 1.0.3),
     textshaping (>= 0.3.0)
-Suggests: 
+Suggests:
     covr,
     graphics,
     grid,
     testthat (>= 3.0.0)
-LinkingTo: 
+LinkingTo:
     systemfonts,
     textshaping
+Config/build/compilation-database: true
 Config/Needs/website: ggplot2, devoid, magick, bench, tidyr, ggridges,
     hexbin, sessioninfo, pkgdown, tidyverse/tidytemplate
+Config/testthat/edition: 3
+Config/usethis/last-upkeep: 2025-04-25
 Encoding: UTF-8
+Roxygen: list(markdown = TRUE)
 RoxygenNote: 7.3.2
 SystemRequirements: freetype2, libpng, libtiff, libjpeg
-Config/testthat/edition: 3
-Roxygen: list(markdown = TRUE)
-Config/build/compilation-database: true

LICENSE

@@ -1,2 +1,2 @@
-YEAR: 2023
+YEAR: 2025
 COPYRIGHT HOLDER: ragg authors

LICENSE.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright (c) 2023 ragg authors
+Copyright (c) 2025 ragg authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

R/aaa.R

@@ -8,18 +8,21 @@ get_dims <- function(width, height, units, res) {
   check_numeric_scalar(width, "width")
   check_numeric_scalar(height, "height")
   check_numeric_scalar(res, "res")
-  dims <- c(width, height) * switch(
-    units,
-    'in' = res,
-    'cm' = res / 2.54,
-    'mm' = res / 25.4,
-    'px' = 1,
-    stop('Unknown unit. Please use either px, in, cm, or, mm', call. = FALSE)
-  )
+  dims <- c(width, height) *
+    switch(
+      units,
+      'in' = res,
+      'cm' = res / 2.54,
+      'mm' = res / 25.4,
+      'px' = 1,
+      stop('Unknown unit. Please use either px, in, cm, or, mm', call. = FALSE)
+    )
   max_dim <- getOption('ragg.max_dim', 5e4)
   if (any(dims > max_dim)) {
     stop(
-      'One or both dimensions exceed the maximum (', max_dim, 'px).\n',
+      'One or both dimensions exceed the maximum (',
+      max_dim,
+      'px).\n',
       '- Use `options(ragg.max_dim = ...)` to change the max\n',
       '  Warning: May cause the R session to crash',
       call. = FALSE
@@ -36,7 +39,9 @@ validate_path <- function(path) {
   dir <- normalizePath(dir)
   path <- file.path(dir, basename(path))
   if (grepl("(?<!%)%(?!%)(?![#0 ,+-]*[0-9.]*[diouxX])", path, perl = TRUE)) {
-    stop("Invalid path. Only use C-style formatting intended for numbers (%d, %i, %o, %u, %x, %X)")
+    stop(
+      "Invalid path. Only use C-style formatting intended for numbers (%d, %i, %o, %u, %x, %X)"
+    )
   }
   path
 }