diff --git a/common/hugo/hugo_test.go b/common/hugo/hugo_test.go index a572f74d4..63b1554e9 100644 --- a/common/hugo/hugo_test.go +++ b/common/hugo/hugo_test.go @@ -35,8 +35,8 @@ func TestDeprecationLogLevelFromVersion(t *testing.T) { c.Assert(deprecationLogLevelFromVersion(ver.String()), qt.Equals, logg.LevelError) // Added just to find the threshold for where we can remove deprecated items. - // Subtract 5 from the minor version of the first ERRORed version => 0.136.0. - c.Assert(deprecationLogLevelFromVersion("0.141.0"), qt.Equals, logg.LevelError) + // Subtract 5 from the minor version of the first ERRORed version => 0.145.0. + c.Assert(deprecationLogLevelFromVersion("0.150.0"), qt.Equals, logg.LevelError) } func TestMarkupScope(t *testing.T) { diff --git a/config/allconfig/allconfig.go b/config/allconfig/allconfig.go index 75613e0de..5613b177c 100644 --- a/config/allconfig/allconfig.go +++ b/config/allconfig/allconfig.go @@ -458,36 +458,6 @@ func (c *Config) CompileConfig(logger loggers.Logger) error { } } - // Legacy privacy values. - if c.Privacy.Twitter.Disable { - hugo.DeprecateWithLogger("project config key privacy.twitter.disable", "Use privacy.x.disable instead.", "v0.141.0", logger.Logger()) - c.Privacy.X.Disable = c.Privacy.Twitter.Disable - } - if c.Privacy.Twitter.EnableDNT { - hugo.DeprecateWithLogger("project config key privacy.twitter.enableDNT", "Use privacy.x.enableDNT instead.", "v0.141.0", logger.Logger()) - c.Privacy.X.EnableDNT = c.Privacy.Twitter.EnableDNT - } - if c.Privacy.Twitter.Simple { - hugo.DeprecateWithLogger("project config key privacy.twitter.simple", "Use privacy.x.simple instead.", "v0.141.0", logger.Logger()) - c.Privacy.X.Simple = c.Privacy.Twitter.Simple - } - - // Legacy services values. - if c.Services.Twitter.DisableInlineCSS { - hugo.DeprecateWithLogger("project config key services.twitter.disableInlineCSS", "Use services.x.disableInlineCSS instead.", "v0.141.0", logger.Logger()) - c.Services.X.DisableInlineCSS = c.Services.Twitter.DisableInlineCSS - } - - // Legacy permalink tokens - for _, pc := range c.Permalinks { - if strings.Contains(pc.Pattern, ":filename") { - hugo.DeprecateWithLogger("the \":filename\" permalink token", "Use \":contentbasename\" instead.", "0.144.0", logger.Logger()) - } - if strings.Contains(pc.Pattern, ":slugorfilename") { - hugo.DeprecateWithLogger("the \":slugorfilename\" permalink token", "Use \":slugorcontentbasename\" instead.", "0.144.0", logger.Logger()) - } - } - // Legacy render hook values. alternativeDetails := fmt.Sprintf( "Set to %q if previous value was false, or set to %q if previous value was true.", diff --git a/config/privacy/privacyConfig.go b/config/privacy/privacyConfig.go index b70720662..6112669a9 100644 --- a/config/privacy/privacyConfig.go +++ b/config/privacy/privacyConfig.go @@ -30,7 +30,6 @@ type Config struct { Disqus Disqus GoogleAnalytics GoogleAnalytics Instagram Instagram - Twitter Twitter `json:"-"` // deprecated in favor of X in v0.141.0 Vimeo Vimeo YouTube YouTube X X @@ -59,19 +58,6 @@ type Instagram struct { Simple bool } -// Twitter holds the privacy configuration settings related to the Twitter shortcode. -// Deprecated in favor of X in v0.141.0. -type Twitter struct { - Service `mapstructure:",squash"` - - // When set to true, the Tweet and its embedded page on your site are not used - // for purposes that include personalized suggestions and personalized ads. - EnableDNT bool - - // If simple mode is enabled, a static and no-JS version of the Tweet will be built. - Simple bool -} - // Vimeo holds the privacy configuration settings related to the Vimeo shortcode. type Vimeo struct { Service `mapstructure:",squash"` diff --git a/config/services/servicesConfig.go b/config/services/servicesConfig.go index 21dd7a6d9..0979fa69a 100644 --- a/config/services/servicesConfig.go +++ b/config/services/servicesConfig.go @@ -31,7 +31,6 @@ type Config struct { Disqus Disqus GoogleAnalytics GoogleAnalytics Instagram Instagram `json:"-"` // the embedded instagram shortcode no longer uses this - Twitter Twitter `json:"-"` // deprecated in favor of X in v0.141.0 X X RSS RSS } @@ -61,15 +60,6 @@ type Instagram struct { AccessToken string // this is no longer used by the embedded instagram shortcode } -// Twitter holds the functional configuration settings related to the Twitter shortcodes. -// Deprecated in favor of X in v0.141.0. -type Twitter struct { - // The Simple variant of Twitter is decorated with a basic set of inline styles. - // This means that if you want to provide your own CSS, you want - // to disable the inline CSS provided by Hugo. - DisableInlineCSS bool -} - // X holds the functional configuration settings related to the X shortcodes. type X struct { // The Simple variant of X is decorated with a basic set of inline styles. diff --git a/hugolib/page__meta.go b/hugolib/page__meta.go index c7141f979..088384a8b 100644 --- a/hugolib/page__meta.go +++ b/hugolib/page__meta.go @@ -21,7 +21,6 @@ import ( "strings" "time" - "github.com/bep/logg" "github.com/gobuffalo/flect" "github.com/gohugoio/hugo/hugofs" "github.com/gohugoio/hugo/hugofs/files" @@ -700,16 +699,6 @@ params: continue } - if loki == "path" || loki == "kind" || loki == "lang" { - // See issue 12484. - // Only warn when the key was set at the top level of the - // original front matter; cascade.params can legitimately carry - // these names as user params (issue 14848). - if _, ok := pm.pageConfigSource.Frontmatter[loki]; ok { - hugo.DeprecateLevelMin(loki+" in front matter", "", "v0.144.0", logg.LevelWarn) - } - } - switch loki { case "title": pcfg.Title = cast.ToString(v) diff --git a/resources/page/hugoinfo.go b/resources/page/hugoinfo.go index 831cbd2d3..64963885d 100644 --- a/resources/page/hugoinfo.go +++ b/resources/page/hugoinfo.go @@ -100,12 +100,6 @@ func (i HugoInfo) Store() *hstore.Scratch { return i.store } -// Deprecated: Use hugo.IsMultihost instead. -func (i HugoInfo) IsMultiHost() bool { - hugo.Deprecate("hugo.IsMultiHost", "Use hugo.IsMultihost instead.", "v0.124.0") - return i.opts.Conf.IsMultihost() -} - // IsMultihost reports whether each configured language has a unique baseURL. func (i HugoInfo) IsMultihost() bool { return i.opts.Conf.IsMultihost()