Pull request against v3.4.4-rc (6bc0a7f3e722d1f0f40f832ac7650e606e9b158b) from refactor/remove-maptools

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

@@ -63,7 +63,7 @@ jobs:
           cache-version: 3
           extra-packages: >
             any::rcmdcheck,
-            Hmisc=?ignore-before-r=3.6.0,
+            Hmisc=?ignore-before-r=4.1.0,
             quantreg=?ignore-before-r=3.6.0,
           needs: check
 

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: ggplot2
-Version: 3.4.3
+Version: 3.4.3.9000
 Title: Create Elegant Data Visualisations Using the Grammar of Graphics
 Authors@R: c(
     person("Hadley", "Wickham", , "[email protected]", role = "aut",
@@ -28,7 +28,7 @@ License: MIT + file LICENSE
 URL: https://ggplot2.tidyverse.org, https://github.com/tidyverse/ggplot2
 BugReports: https://github.com/tidyverse/ggplot2/issues
 Depends:
-    R (>= 3.3)
+    R (>= 3.5)
 Imports: 
     cli,
     glue,
@@ -52,18 +52,15 @@ Suggests:
     hexbin,
     Hmisc,
     knitr,
-    lattice,
     mapproj,
     maps,
-    maptools,
     multcomp,
     munsell,
     nlme,
     profvis,
     quantreg,
     ragg,
     RColorBrewer,
-    rgeos,
     rmarkdown,
     rpart,
     sf (>= 0.7-3),
@@ -175,20 +172,22 @@ Collate:
     'grob-dotstack.R'
     'grob-null.R'
     'grouping.R'
+    'guide-.R'
+    'guide-axis.R'
+    'guide-legend.R'
     'guide-bins.R'
     'guide-colorbar.R'
     'guide-colorsteps.R'
-    'guide-legend.R'
+    'layer.R'
+    'guide-none.R'
+    'guide-old.R'
     'guides-.R'
-    'guides-axis.R'
     'guides-grid.R'
-    'guides-none.R'
     'hexbin.R'
     'import-standalone-obj-type.R'
     'import-standalone-types-check.R'
     'labeller.R'
     'labels.R'
-    'layer.R'
     'layer-sf.R'
     'layout.R'
     'limits.R'

NAMESPACE

@@ -55,12 +55,12 @@ S3method(ggplot_add,"NULL")
 S3method(ggplot_add,"function")
 S3method(ggplot_add,Coord)
 S3method(ggplot_add,Facet)
+S3method(ggplot_add,Guides)
 S3method(ggplot_add,Layer)
 S3method(ggplot_add,Scale)
 S3method(ggplot_add,by)
 S3method(ggplot_add,data.frame)
 S3method(ggplot_add,default)
-S3method(ggplot_add,guides)
 S3method(ggplot_add,labels)
 S3method(ggplot_add,list)
 S3method(ggplot_add,theme)
@@ -75,30 +75,11 @@ S3method(grobWidth,absoluteGrob)
 S3method(grobWidth,zeroGrob)
 S3method(grobX,absoluteGrob)
 S3method(grobY,absoluteGrob)
-S3method(guide_gengrob,axis)
-S3method(guide_gengrob,bins)
-S3method(guide_gengrob,colorbar)
-S3method(guide_gengrob,guide_none)
-S3method(guide_gengrob,legend)
-S3method(guide_geom,axis)
-S3method(guide_geom,bins)
-S3method(guide_geom,colorbar)
-S3method(guide_geom,guide_none)
-S3method(guide_geom,legend)
-S3method(guide_merge,axis)
-S3method(guide_merge,bins)
-S3method(guide_merge,colorbar)
-S3method(guide_merge,guide_none)
-S3method(guide_merge,legend)
-S3method(guide_train,axis)
-S3method(guide_train,bins)
-S3method(guide_train,colorbar)
-S3method(guide_train,colorsteps)
-S3method(guide_train,guide_none)
-S3method(guide_train,legend)
-S3method(guide_transform,axis)
+S3method(guide_gengrob,default)
+S3method(guide_geom,default)
+S3method(guide_merge,default)
+S3method(guide_train,default)
 S3method(guide_transform,default)
-S3method(guide_transform,guide_none)
 S3method(heightDetails,titleGrob)
 S3method(heightDetails,zeroGrob)
 S3method(interleave,default)
@@ -109,7 +90,6 @@ S3method(limits,POSIXlt)
 S3method(limits,character)
 S3method(limits,factor)
 S3method(limits,numeric)
-S3method(makeContent,labelgrob)
 S3method(makeContext,dotstackGrob)
 S3method(merge_element,default)
 S3method(merge_element,element)
@@ -229,6 +209,14 @@ export(GeomText)
 export(GeomTile)
 export(GeomViolin)
 export(GeomVline)
+export(Guide)
+export(GuideAxis)
+export(GuideBins)
+export(GuideColourbar)
+export(GuideColoursteps)
+export(GuideLegend)
+export(GuideNone)
+export(GuideOld)
 export(Layout)
 export(Position)
 export(PositionDodge)
@@ -473,6 +461,8 @@ export(mean_sdl)
 export(mean_se)
 export(median_hilow)
 export(merge_element)
+export(new_guide)
+export(old_guide)
 export(panel_cols)
 export(panel_rows)
 export(position_dodge)
@@ -688,6 +678,7 @@ export(theme_test)
 export(theme_update)
 export(theme_void)
 export(transform_position)
+export(translate_shape_string)
 export(unit)
 export(update_geom_defaults)
 export(update_labels)