resolve merge conflict

Merge branch 'main' into yjunechoe-curly-braces-ggproto-methods

# Conflicts:
#	R/coord-.R
#	R/coord-cartesian-.R
#	R/coord-transform.R
#	R/facet-.R
#	R/geom-.R
#	R/stat-unique.R

Author: teunbrand

.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

@@ -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,7 +31,7 @@ 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)
+    R (>= 4.1)
 Imports:
     cli,
     grDevices,
@@ -63,6 +64,7 @@ Suggests:
     ragg (>= 1.2.6),
     RColorBrewer,
     rmarkdown,
+    roxygen2,
     rpart,
     sf (>= 0.7-3),
     svglite (>= 2.1.2),
@@ -76,7 +78,7 @@ VignetteBuilder:
     knitr
 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)
@@ -93,11 +95,15 @@ Collate:
     'compat-plyr.R'
     'utilities.R'
     'aes.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'
@@ -142,6 +148,7 @@ Collate:
     'geom-col.R'
     'geom-path.R'
     'geom-contour.R'
+    'geom-point.R'
     'geom-count.R'
     'geom-crossbar.R'
     'geom-segment.R'
@@ -160,7 +167,6 @@ Collate:
     'geom-jitter.R'
     'geom-label.R'
     'geom-linerange.R'
-    'geom-point.R'
     'geom-pointrange.R'
     'geom-quantile.R'
     'geom-rug.R'
@@ -186,7 +192,6 @@ Collate:
     'guide-colorbar.R'
     'guide-colorsteps.R'
     'guide-custom.R'
-    'layer.R'
     'guide-none.R'
     'guide-old.R'
     'guides-.R'
@@ -236,7 +241,6 @@ Collate:
     'scale-shape.R'
     'scale-size.R'
     'scale-steps.R'
-    'scale-type.R'
     'scale-view.R'
     'scale-viridis.R'
     'scales-.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

NAMESPACE

@@ -28,6 +28,7 @@ S3method(element_grob,element_rect)
 S3method(element_grob,element_text)
 S3method(format,ggproto)
 S3method(format,ggproto_method)
+S3method(format,rd_section_aesthetics)
 S3method(fortify,"NULL")
 S3method(fortify,"function")
 S3method(fortify,Line)
@@ -95,6 +96,8 @@ S3method(limits,character)
 S3method(limits,factor)
 S3method(limits,numeric)
 S3method(makeContext,dotstackGrob)
+S3method(make_constructor,Geom)
+S3method(make_constructor,Stat)
 S3method(merge_element,default)
 S3method(merge_element,element)
 S3method(merge_element,element_blank)
@@ -168,6 +171,7 @@ export(CoordQuickmap)
 export(CoordRadial)
 export(CoordSf)
 export(CoordTrans)
+export(CoordTransform)
 export(Facet)
 export(FacetGrid)
 export(FacetNull)
@@ -294,6 +298,7 @@ export(after_scale)
 export(after_stat)
 export(alpha)
 export(annotate)
+export(annotation_borders)
 export(annotation_custom)
 export(annotation_logticks)
 export(annotation_map)
@@ -322,6 +327,7 @@ export(coord_quickmap)
 export(coord_radial)
 export(coord_sf)
 export(coord_trans)
+export(coord_transform)
 export(cut_interval)
 export(cut_number)
 export(cut_width)
@@ -474,7 +480,6 @@ export(is.facet)
 export(is.ggplot)
 export(is.ggproto)
 export(is.theme)
-export(is.waiver)
 export(is_coord)
 export(is_facet)
 export(is_geom)
@@ -490,6 +495,7 @@ export(is_scale)
 export(is_stat)
 export(is_theme)
 export(is_theme_element)
+export(is_waiver)
 export(label_both)
 export(label_bquote)
 export(label_context)
@@ -505,6 +511,7 @@ export(layer_grob)
 export(layer_scales)
 export(layer_sf)
 export(lims)
+export(make_constructor)
 export(map_data)
 export(margin)
 export(margin_auto)