resolve merge conflict

Merge branch 'main' into discard_zerogrob

# Conflicts:
#	NAMESPACE
#	R/grob-null.R
#	R/utilities.R
#	man/stat_connect.Rd
#	tests/testthat/test-facet-strips.R

Author: teunbrand

.github/ISSUE_TEMPLATE/bug_report.md

@@ -5,7 +5,7 @@ about: Submit a bug report to help us improve ggplot2
 
 ### Tips for a helpful bug report:
 
-* If you have a question, please don't use this form. Instead, ask on <https://stackoverflow.com/> or <https://community.rstudio.com/>.
+* If you have a question, please don't use this form. Instead, ask on <https://stackoverflow.com/> or <https://forum.posit.co/>.
 
 * Please include a **minimal reproducible example**, a reprex, to demonstrate the bug.
 If you've never heard of a reprex, please read ["Make a reprex"](https://www.tidyverse.org/help/#reprex).

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
 contact_links:
   - name: Help or discussion
-    url: https://community.rstudio.com/
-    about: "Check out options for getting help on the RStudio Community."
+    url: https://forum.posit.co/
+    about: "Check out options for getting help on the Posit Community (formerly RStudio Community)."

.github/ISSUE_TEMPLATE/feature_request.md

@@ -5,7 +5,7 @@ about: Suggest a change or new feature in ggplot2
 
 ### Tips for a helpful feature request:
 
-* If you have a question, please don't use this form. Instead, ask on <https://stackoverflow.com/> or <https://community.rstudio.com/>.
+* If you have a question, please don't use this form. Instead, ask on <https://stackoverflow.com/> or <https://forum.posit.co/>.
 
 * See the [contributing guidelines](https://github.com/tidyverse/ggplot2/blob/main/CONTRIBUTING.md).
 

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

@@ -58,7 +58,22 @@ jobs:
           http-user-agent: ${{ matrix.config.http-user-agent }}
           use-public-rspm: true
 
+      # TODO: remove this when R 4.6 is released
+      - name: Tweak for old Windows (R 4.1)
+        uses: r-lib/actions/setup-r-dependencies@v2
+        if: ${{ matrix.config.os == 'windows-latest' && matrix.config.r == 'oldrel-4' }}
+        with:
+          cache-version: 3
+          extra-packages: >
+            any::rcmdcheck,
+            [email protected],
+            Hmisc=?ignore-before-r=4.2.0,
+            quantreg=?ignore-before-r=4.3.0
+            local::.
+          needs: check
+
       - uses: r-lib/actions/setup-r-dependencies@v2
+        if: ${{ matrix.config.os != 'windows-latest' || matrix.config.r != 'oldrel-4' }}
         with:
           cache-version: 3
           extra-packages: >

.github/workflows/test-coverage.yaml

@@ -35,14 +35,16 @@ jobs:
             clean = FALSE,
             install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
           )
+          print(cov)
           covr::to_cobertura(cov)
         shell: Rscript {0}
 
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
-          fail_ci_if_error: ${{ github.event_name != 'pull_request' && true || false }}
-          file: ./cobertura.xml
-          plugin: noop
+          # 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 }}
 

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: ggplot2
 Title: Create Elegant Data Visualisations Using the Grammar of Graphics
-Version: 3.5.1.9000
+Version: 4.0.1.9000
 Authors@R: c(
     person("Hadley", "Wickham", , "[email protected]", role = "aut",
            comment = c(ORCID = "0000-0003-4757-117X")),
@@ -20,7 +20,8 @@ Authors@R: c(
            comment = c(ORCID = "0000-0002-9415-4582")),
     person("Teun", "van den Brand", role = "aut",
            comment = c(ORCID = "0000-0002-9335-7468")),
-    person("Posit, PBC", role = c("cph", "fnd"))
+    person("Posit, PBC", role = c("cph", "fnd"),
+           comment = c(ROR = "03wc8by49"))
   )
 Description: A system for 'declaratively' creating graphics, based on "The
     Grammar of Graphics". You provide the data, tell 'ggplot2' how to map
@@ -30,16 +31,17 @@ License: MIT + file LICENSE
 URL: https://ggplot2.tidyverse.org, https://github.com/tidyverse/ggplot2
 BugReports: https://github.com/tidyverse/ggplot2/issues
 Depends:
-    R (>= 4.0)
-Imports: 
+    R (>= 4.1)
+Imports:
     cli,
     grDevices,
     grid,
     gtable (>= 0.3.6),
     isoband,
     lifecycle (> 1.0.1),
     rlang (>= 1.1.0),
-    scales (>= 1.3.0),
+    S7,
+    scales (>= 1.4.0),
     stats,
     vctrs (>= 0.6.0),
     withr (>= 2.5.0)
@@ -50,6 +52,7 @@ Suggests:
     ggplot2movies,
     hexbin,
     Hmisc,
+    hms,
     knitr,
     mapproj,
     maps,
@@ -60,50 +63,52 @@ Suggests:
     nlme,
     profvis,
     quantreg,
+    quarto,
     ragg (>= 1.2.6),
     RColorBrewer,
-    rmarkdown,
+    roxygen2,
     rpart,
     sf (>= 0.7-3),
     svglite (>= 2.1.2),
-    testthat (>= 3.1.5),
+    testthat (>= 3.3.0),
     tibble,
     vdiffr (>= 1.0.6),
     xml2
-Enhances: 
+Enhances:
     sp
 VignetteBuilder: 
-    knitr
+    quarto
 Config/Needs/website: ggtext, tidyr, forcats, tidyverse/tidytemplate
 Config/testthat/edition: 3
-Config/usethis/last-upkeep: 2024-10-24
+Config/usethis/last-upkeep: 2025-04-23
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.2
-Collate: 
-    'ggproto.R'
+RoxygenNote: 7.3.3
+Collate:
+    'aes-delayed-eval.R'
+    'aes-variants.R'
     'ggplot-global.R'
-    'aaa-.R'
-    'aes-colour-fill-alpha.R'
-    'aes-evaluation.R'
-    'aes-group-order.R'
-    'aes-linetype-size-shape.R'
-    'aes-position.R'
+    'ggproto.R'
+    'all-classes.R'
     'compat-plyr.R'
     'utilities.R'
     'aes.R'
+    'annotate.R'
+    'annotation-borders.R'
     'utilities-checks.R'
     'legend-draw.R'
     'geom-.R'
     'annotation-custom.R'
     'annotation-logticks.R'
+    'scale-type.R'
+    'layer.R'
+    'make-constructor.R'
     'geom-polygon.R'
     'geom-map.R'
     'annotation-map.R'
     'geom-raster.R'
     'annotation-raster.R'
-    'annotation.R'
     'autolayer.R'
     'autoplot.R'
     'axis-secondary.R'
@@ -122,31 +127,32 @@ Collate:
     'coord-sf.R'
     'coord-transform.R'
     'data.R'
-    'docs_layer.R'
+    'docs-aes.R'
+    'docs-layer.R'
     'facet-.R'
     'facet-grid-.R'
+    'facet-labeller.R'
     'facet-null.R'
     'facet-wrap.R'
     'fortify-map.R'
     'fortify-models.R'
     'fortify-spatial.R'
     'fortify.R'
     'stat-.R'
-    'geom-abline.R'
+    'geom-abline-hline-vline.R'
     'geom-rect.R'
     'geom-bar.R'
     'geom-tile.R'
     'geom-bin2d.R'
     'geom-blank.R'
     'geom-boxplot.R'
-    'geom-col.R'
     'geom-path.R'
     'geom-contour.R'
+    'geom-point.R'
     'geom-count.R'
     'geom-crossbar.R'
     'geom-segment.R'
     'geom-curve.R'
-    'geom-defaults.R'
     'geom-ribbon.R'
     'geom-density.R'
     'geom-density2d.R'
@@ -156,24 +162,24 @@ Collate:
     'geom-function.R'
     'geom-hex.R'
     'geom-histogram.R'
-    'geom-hline.R'
     'geom-jitter.R'
     'geom-label.R'
     'geom-linerange.R'
-    'geom-point.R'
     'geom-pointrange.R'
     'geom-quantile.R'
     'geom-rug.R'
     'geom-sf.R'
     'geom-smooth.R'
     'geom-spoke.R'
     'geom-text.R'
+    'geom-update-defaults.R'
     'geom-violin.R'
-    'geom-vline.R'
     'ggplot2-package.R'
     'grob-absolute.R'
     'grob-dotstack.R'
     'grouping.R'
+    'properties.R'
+    'margins.R'
     'theme-elements.R'
     'guide-.R'
     'guide-axis.R'
@@ -185,24 +191,21 @@ Collate:
     'guide-colorbar.R'
     'guide-colorsteps.R'
     'guide-custom.R'
-    'layer.R'
     'guide-none.R'
     'guide-old.R'
     'guides-.R'
     'guides-grid.R'
     'hexbin.R'
     'import-standalone-obj-type.R'
     'import-standalone-types-check.R'
-    'labeller.R'
     'labels.R'
     'layer-sf.R'
     'layout.R'
     'limits.R'
-    'margins.R'
-    'performance.R'
     'plot-build.R'
     'plot-construction.R'
     'plot-last.R'
+    'plot-render.R'
     'plot.R'
     'position-.R'
     'position-collide.R'
@@ -235,7 +238,6 @@ Collate:
     'scale-shape.R'
     'scale-size.R'
     'scale-steps.R'
-    'scale-type.R'
     'scale-view.R'
     'scale-viridis.R'
     'scales-.R'
@@ -279,6 +281,7 @@ Collate:
     'utilities-grid.R'
     'utilities-help.R'
     'utilities-patterns.R'
+    'utilities-performance.R'
     'utilities-resolution.R'
     'utilities-tidy-eval.R'
     'zxx.R'

LICENSE

@@ -1,2 +1,2 @@
-YEAR: 2024
+YEAR: 2025
 COPYRIGHT HOLDER: ggplot2 core developer team

LICENSE.md

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