Skip to content

Commit 2aa05aa

Browse files
committed
Make Scala versions more consistent
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).
1 parent 1e106df commit 2aa05aa

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

build.sbt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ import com.typesafe.sbt.osgi.SbtOsgi
22
import com.typesafe.sbt.osgi.SbtOsgi.autoImport._
33
import com.typesafe.tools.mima.core._
44

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

117
val disablePublishingSettings = Seq(
128
// https://github.com/sbt/sbt/pull/3380
@@ -16,10 +12,11 @@ val disablePublishingSettings = Seq(
1612
)
1713

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

0 commit comments

Comments
 (0)