Merge branch 'master' into update/scala-library-2.11.12

scala-steward · scala-steward · commit b78587294b10 · 2023-08-07T17:00:18.000Z
diff --git a/build.sbt b/build.sbt
@@ -2,11 +2,11 @@ name := "scala-retry"
 
 organization := "com.github.hipjim"
 
-crossScalaVersions := Seq("2.10.6", "2.11.10", "2.12.15","2.13.8", "3.0.2")
+crossScalaVersions := Seq("2.10.6", "2.11.10", "2.12.15","2.13.11", "3.0.2")
 
 version := "0.5.0-SNAPSHOT"
 
-scalaVersion := "2.13.8"
+scalaVersion := "2.13.11"
 
 scalacOptions ++= Seq(
   // warnings
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,3 +1,3 @@
-addSbtPlugin("com.github.sbt"  % "sbt-pgp"         % "2.1.2")
+addSbtPlugin("com.github.sbt"  % "sbt-pgp"         % "2.2.1")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt"    % "2.3.2")
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")`
	`1`	`+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")`
`2`	`2`	`addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.2")`
`3`	`3`