Skip to content

Commit

Permalink
Updates (#272)
Browse files Browse the repository at this point in the history
  • Loading branch information
travisbrown authored May 26, 2021
1 parent 824510a commit ae132e6
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 13 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ target/
.project
.classpath
tmp/
.bsp/
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ sudo: required
dist: trusty

scala:
- 2.12.10
- 2.13.1
- 2.12.13
- 2.13.6

jdk:
- oraclejdk8
Expand Down
12 changes: 6 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ val compilerOptions = Seq(
"-Ywarn-numeric-widen"
)

val circeVersion = "0.13.0"
val munitVersion = "0.7.19"
val previousCirceJacksonVersion = "0.12.0"
val disciplineMunitVersion = "1.0.7"
val circeVersion = "0.14.1"
val munitVersion = "0.7.26"
val previousCirceJacksonVersion = "0.13.0"
val disciplineMunitVersion = "1.0.9"

def priorTo2_13(scalaVersion: String): Boolean =
CrossVersion.partialVersion(scalaVersion) match {
Expand Down Expand Up @@ -163,7 +163,7 @@ lazy val jackson212 = project
.settings(allSettings)
.settings(
moduleName := "circe-jackson212",
libraryDependencies ++= jacksonDependencies("2.12.2"),
libraryDependencies ++= jacksonDependencies("2.12.3"),
unmanagedSourceDirectories in Compile += (baseDirectory in ThisBuild).value / "210"
)

Expand All @@ -181,7 +181,7 @@ lazy val benchmark = project
)
)
.enablePlugins(JmhPlugin)
.dependsOn(jackson210)
.dependsOn(jackson212)

lazy val noPublishSettings = Seq(
publish := {},
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.4.7
sbt.version=1.5.2
8 changes: 4 additions & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
addSbtPlugin("com.dwijnand" % "sbt-travisci" % "1.2.0")
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.2")
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.0")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.1")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.2")

0 comments on commit ae132e6

Please sign in to comment.