Skip to content

Commit b8b4918

Browse files
authored
Merge pull request #976 from profunktor/update/scala-library-2.13.16
Update scala-library, scala-reflect to 2.13.16
2 parents 9619975 + f17ae35 commit b8b4918

File tree

1 file changed

+61
-61
lines changed

1 file changed

+61
-61
lines changed

build.sbt

+61-61
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import com.scalapenos.sbt.prompt._
33
import Dependencies._
44
import microsites.ExtraMdFileConfig
55

6-
ThisBuild / scalaVersion := "2.13.15"
7-
ThisBuild / crossScalaVersions := Seq("2.12.20", "2.13.15", "3.3.4")
6+
ThisBuild / scalaVersion := "2.13.16"
7+
ThisBuild / crossScalaVersions := Seq("2.12.20", "2.13.16", "3.3.4")
88
ThisBuild / evictionErrorLevel := Level.Info
99
ThisBuild / mimaBaseVersion := "1.8.0"
1010
Test / parallelExecution := false
@@ -43,39 +43,39 @@ val commonSettings = Seq(
4343
headerLicense := Some(HeaderLicense.ALv2("2018-2021", "ProfunKtor")),
4444
testFrameworks += new TestFramework("munit.Framework"),
4545
libraryDependencies ++= Seq(
46-
Libraries.catsEffectKernel,
47-
Libraries.redisClient,
48-
Libraries.catsEffect % Test,
49-
Libraries.catsLaws % Test,
50-
Libraries.catsTestKit % Test,
51-
Libraries.munitCore % Test,
52-
Libraries.munitScalacheck % Test
53-
) ++ pred(scalaVersion.value.startsWith("3"), t = Seq.empty, f = Seq(CompilerPlugins.kindProjector)),
46+
Libraries.catsEffectKernel,
47+
Libraries.redisClient,
48+
Libraries.catsEffect % Test,
49+
Libraries.catsLaws % Test,
50+
Libraries.catsTestKit % Test,
51+
Libraries.munitCore % Test,
52+
Libraries.munitScalacheck % Test
53+
) ++ pred(scalaVersion.value.startsWith("3"), t = Seq.empty, f = Seq(CompilerPlugins.kindProjector)),
5454
resolvers += "Apache public" at "https://repository.apache.org/content/groups/public/",
5555
scalacOptions ++= pred(
56-
getVersion(scalaVersion.value) == Some(2, 12),
57-
t = Seq("-Xmax-classfile-name", "80"),
58-
f = Seq.empty
59-
),
56+
getVersion(scalaVersion.value) == Some(2, 12),
57+
t = Seq("-Xmax-classfile-name", "80"),
58+
f = Seq.empty
59+
),
6060
scalacOptions ++= pred(
61-
scalaVersion.value.startsWith("3"),
62-
t = Seq("-source:3.0-migration"),
63-
f = Seq("-Wconf:any:wv")
64-
),
61+
scalaVersion.value.startsWith("3"),
62+
t = Seq("-source:3.0-migration"),
63+
f = Seq("-Wconf:any:wv")
64+
),
6565
Compile / doc / sources := (Compile / doc / sources).value,
6666
Compile / unmanagedSourceDirectories ++= {
67-
getVersion(scalaVersion.value) match {
68-
case Some((2, 12)) => Seq("scala-2.12", "scala-2")
69-
case Some((2, 13)) => Seq("scala-2.13+", "scala-2")
70-
case _ => Seq("scala-2.13+", "scala-3")
71-
}
72-
}.map(baseDirectory.value / "src" / "main" / _),
67+
getVersion(scalaVersion.value) match {
68+
case Some((2, 12)) => Seq("scala-2.12", "scala-2")
69+
case Some((2, 13)) => Seq("scala-2.13+", "scala-2")
70+
case _ => Seq("scala-2.13+", "scala-3")
71+
}
72+
}.map(baseDirectory.value / "src" / "main" / _),
7373
Compile / doc / scalacOptions ++= Seq("-groups", "-implicits"),
7474
autoAPIMappings := true,
7575
scalafmtOnCompile := true,
7676
scmInfo := Some(
77-
ScmInfo(url("https://github.com/profunktor/redis4cats"), "scm:git:[email protected]:profunktor/redis4cats.git")
78-
)
77+
ScmInfo(url("https://github.com/profunktor/redis4cats"), "scm:git:[email protected]:profunktor/redis4cats.git")
78+
)
7979
)
8080

8181
lazy val noPublish = Seq(
@@ -109,7 +109,7 @@ lazy val `redis4cats-core` = project
109109
.settings(libraryDependencies += Libraries.literally)
110110
.settings(
111111
libraryDependencies ++=
112-
pred(scalaVersion.value.startsWith("3"), t = Seq.empty, f = Seq(Libraries.reflect(scalaVersion.value)))
112+
pred(scalaVersion.value.startsWith("3"), t = Seq.empty, f = Seq(Libraries.reflect(scalaVersion.value)))
113113
)
114114
.settings(
115115
isMimaEnabled := true,
@@ -170,13 +170,13 @@ lazy val examples = project
170170
.settings(noPublish)
171171
.settings(
172172
libraryDependencies ++= Seq(
173-
Libraries.catsEffect,
174-
Libraries.circeCore,
175-
Libraries.circeGeneric,
176-
Libraries.circeParser,
177-
Libraries.log4CatsSlf4j,
178-
Libraries.logback % "runtime"
179-
)
173+
Libraries.catsEffect,
174+
Libraries.circeCore,
175+
Libraries.circeGeneric,
176+
Libraries.circeParser,
177+
Libraries.log4CatsSlf4j,
178+
Libraries.logback % "runtime"
179+
)
180180
)
181181
.enablePlugins(AutomateHeaderPlugin)
182182
.dependsOn(`redis4cats-log4cats`)
@@ -207,41 +207,41 @@ lazy val microsite = project
207207
micrositeDocumentationUrl := "/api",
208208
micrositeBaseUrl := "",
209209
micrositeExtraMdFiles := Map(
210-
file("README.md") -> ExtraMdFileConfig(
211-
"index.md",
212-
"home",
213-
Map("title" -> "Home", "position" -> "0")
214-
),
215-
file("CODE_OF_CONDUCT.md") -> ExtraMdFileConfig(
216-
"CODE_OF_CONDUCT.md",
217-
"page",
218-
Map("title" -> "Code of Conduct")
219-
)
220-
),
210+
file("README.md") -> ExtraMdFileConfig(
211+
"index.md",
212+
"home",
213+
Map("title" -> "Home", "position" -> "0")
214+
),
215+
file("CODE_OF_CONDUCT.md") -> ExtraMdFileConfig(
216+
"CODE_OF_CONDUCT.md",
217+
"page",
218+
Map("title" -> "Code of Conduct")
219+
)
220+
),
221221
micrositeExtraMdFilesOutput := (Compile / resourceManaged).value / "jekyll",
222222
micrositeGitterChannel := true,
223223
micrositeGitterChannelUrl := "profunktor-dev/redis4cats",
224224
micrositePushSiteWith := GitHub4s,
225225
micrositeGithubToken := sys.env.get("GITHUB_TOKEN"),
226226
scalacOptions --= Seq(
227-
"-Werror",
228-
"-Xfatal-warnings",
229-
"-Ywarn-unused-import",
230-
"-Ywarn-numeric-widen",
231-
"-Ywarn-dead-code",
232-
"-deprecation",
233-
"-Xlint:-missing-interpolator,_",
234-
"-Wconf:any:wv"
235-
),
227+
"-Werror",
228+
"-Xfatal-warnings",
229+
"-Ywarn-unused-import",
230+
"-Ywarn-numeric-widen",
231+
"-Ywarn-dead-code",
232+
"-deprecation",
233+
"-Xlint:-missing-interpolator,_",
234+
"-Wconf:any:wv"
235+
),
236236
addMappingsToSiteDir(ScalaUnidoc / packageDoc / mappings, micrositeDocumentationUrl),
237237
ScalaUnidoc / unidoc / scalacOptions ++= Seq(
238-
"-doc-source-url",
239-
scmInfo.value.get.browseUrl + "/tree/master€{FILE_PATH}.scala",
240-
"-sourcepath",
241-
(LocalRootProject / baseDirectory).value.getAbsolutePath,
242-
"-doc-root-content",
243-
((Compile / resourceDirectory).value / "rootdoc.txt").getAbsolutePath
244-
),
238+
"-doc-source-url",
239+
scmInfo.value.get.browseUrl + "/tree/master€{FILE_PATH}.scala",
240+
"-sourcepath",
241+
(LocalRootProject / baseDirectory).value.getAbsolutePath,
242+
"-doc-root-content",
243+
((Compile / resourceDirectory).value / "rootdoc.txt").getAbsolutePath
244+
),
245245
ScalaUnidoc / unidoc / unidocProjectFilter := inAnyProject -- inProjects(examples)
246246
)
247247
.dependsOn(`redis4cats-effects`, `redis4cats-streams`, examples)

0 commit comments

Comments
 (0)