Skip to content

Commit

Permalink
Merge pull request #329 from scala-steward/update/3.0.x/patches
Browse files Browse the repository at this point in the history
[3.0.x] Patch updates
  • Loading branch information
mkurz authored Jul 30, 2024
2 parents 3695095 + 74cd825 commit 516258d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.8.3
74504eabba695079dc83931746f073bc5eeb9a38
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi
rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ]
spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in import x.{ yyy }
trailingCommas = preserve
version = 3.8.2
version = 3.8.3
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#
# Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
#
sbt.version=1.10.0
sbt.version=1.10.1
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ object CacheDirectiveParser {
// http://bitwalker.org/blog/2013/08/10/learn-by-example-scala-parser-combinators/
// https://wiki.scala-lang.org/display/SW/Parser+Combinators--Getting+Started
// http://www.bizcoder.com/everything-you-need-to-know-about-http-header-syntax-but-were-afraid-to-ask

import CacheDirectives._

private val logger = LoggerFactory.getLogger("org.playframework.cachecontrol.CacheControlParser")
Expand Down

0 comments on commit 516258d

Please sign in to comment.