Merge branch 'r-spatial:main' into sep-doc

Author: olivroy

.Rbuildignore

@@ -15,8 +15,6 @@ rdev
 hub
 tic.R
 NOTES
-^\.github/workflows/R-CMD-check\.yaml$
-^\.github/workflows/R-CMD-check-with-db\.yaml$
 ^\.ccache$
 ^\.github$
 ^tic\.R$

.github/.gitignore

@@ -0,0 +1 @@
+*.html

.github/workflows/rcmdcheck.yml renamed to .github/workflows/R-CMD-check.yaml

@@ -24,6 +24,8 @@ jobs:
           - {os: windows-latest, r: 'release'}
           - {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'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
@@ -36,13 +38,12 @@ jobs:
 
       - uses: r-lib/actions/setup-r@v2
         with:
-          rtools-version: '42'
           r-version: ${{ matrix.config.r }}
           http-user-agent: ${{ matrix.config.http-user-agent }}
           use-public-rspm: true
 
       - name: Install macOS system dependencies
-        if: runner.os == 'macOS'
+        if: runner.os == 'macos'
         run: brew install gdal proj
 
       - uses: r-lib/actions/setup-r-dependencies@v2

.github/workflows/pkgdown.yml renamed to .github/workflows/pkgdown.yaml

@@ -19,6 +19,8 @@ jobs:
       group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v4
 
@@ -39,7 +41,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/test-coverage.yaml

@@ -23,15 +23,15 @@ jobs:
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: any::covr, any::XML
+          extra-packages: any::covr
           needs: coverage
 
       - name: Test coverage
         run: |
           covr::codecov(
             quiet = FALSE,
             clean = FALSE,
-            install_path = file.path(Sys.getenv("RUNNER_TEMP"), "package")
+            install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
           )
         shell: Rscript {0}
 
@@ -44,7 +44,7 @@ jobs:
 
       - 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

.github/workflows/tic-db.yml

@@ -50,7 +50,7 @@ jobs:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-r@v2
         with:
@@ -145,7 +145,7 @@ jobs:
 
       - name: "[Stage] Upload R CMD check artifacts"
         if: failure()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ runner.os }}-r${{ matrix.config.r }}-results
           path: check

DESCRIPTION

@@ -78,7 +78,7 @@ Suggests:
     dplyr (>= 1.0.0),
     ggplot2,
     knitr,
-    lwgeom (>= 0.2-1),
+    lwgeom (>= 0.2-14),
     maps,
     mapview,
     Matrix,
@@ -116,6 +116,7 @@ Encoding: UTF-8
 RoxygenNote: 7.3.0
 Roxygen: list(markdown = TRUE)
 Config/testthat/edition: 2
+Config/needs/coverage: XML
 SystemRequirements: GDAL (>= 2.0.1), GEOS (>= 3.4.0),
     PROJ (>= 4.8.0), sqlite3
 Collate: 

README.md

@@ -1,5 +1,5 @@
 <!-- badges: start -->
-[![rcmdcheck](https://github.com/r-spatial/sf/actions/workflows/rcmdcheck.yml/badge.svg?branch=main)](https://github.com/r-spatial/sf/actions/workflows/rcmdcheck.yml)
+[![R-CMD-check](https://github.com/r-spatial/sf/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/r-spatial/sf/actions/workflows/R-CMD-check.yaml)
 [![tic-db](https://github.com/r-spatial/sf/workflows/tic-db/badge.svg?branch=main)](https://github.com/r-spatial/sf/actions)
 [![Coverage Status](https://img.shields.io/codecov/c/github/r-spatial/sf/main.svg)](https://app.codecov.io/gh/r-spatial/sf)
 [![License](http://img.shields.io/badge/license-GPL%20%28%3E=%202%29-brightgreen.svg?style=flat)](http://www.gnu.org/licenses/gpl-2.0.html)