Skip to content

Commit

Permalink
Make Scala versions more consistent
Browse files Browse the repository at this point in the history
Somehow the release plugin got confused about 2.12.12 (the default for
this sbt version) and 2.12.10 (the one specified for this
ssl-config-core).
  • Loading branch information
raboof committed Mar 23, 2021
1 parent 1e106df commit 2aa05aa
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@ import com.typesafe.sbt.osgi.SbtOsgi
import com.typesafe.sbt.osgi.SbtOsgi.autoImport._
import com.typesafe.tools.mima.core._

val commonSettings = Seq(
scalaVersion := Version.scala212,
crossScalaVersions := Seq(Version.scala213, Version.scala212, Version.scala211),
javacOptions ++= Seq("-source", "1.8", "-target", "1.8")
)
ThisBuild / scalaVersion := Version.scala212

val disablePublishingSettings = Seq(
// https://github.com/sbt/sbt/pull/3380
Expand All @@ -16,10 +12,11 @@ val disablePublishingSettings = Seq(
)

lazy val sslConfigCore = project.in(file("ssl-config-core"))
.settings(commonSettings: _*)
.settings(AutomaticModuleName.settings("ssl.config.core"))
.settings(osgiSettings: _*)
.settings(
crossScalaVersions := Seq(Version.scala213, Version.scala212, Version.scala211),
javacOptions ++= Seq("-source", "1.8", "-target", "1.8"),
name := "ssl-config-core",
mimaReportSignatureProblems := true,
mimaPreviousArtifacts ++= (((CrossVersion.partialVersion(scalaVersion.value) match {
Expand Down

0 comments on commit 2aa05aa

Please sign in to comment.