Skip to content

Commit

Permalink
fix crossScalaVersions setting (#267)
Browse files Browse the repository at this point in the history
  • Loading branch information
xuwei-k committed Oct 19, 2023
1 parent 958089a commit fd9bfc2
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,8 @@ val Scala212 = "2.12.18"
val Scala213 = "2.13.12"
val Scala3 = "3.2.2"

val versionsBase = Seq(Scala212, Scala213)
val versionsJVM = versionsBase :+ Scala3
val versionsJS = versionsJVM
val versionsNative = versionsJVM

ThisBuild / scalaVersion := Scala212
ThisBuild / crossScalaVersions := versionsBase
ThisBuild / crossScalaVersions := Seq(Scala212, Scala213, Scala3)

ThisBuild / organization := "com.thesamet.scalapb"

Expand Down Expand Up @@ -51,11 +46,7 @@ lazy val protobufRuntimeScala =
}
}
)
.jvmSettings(
crossScalaVersions := Seq(Scala212, Scala213, Scala3)
)
.jsSettings(
crossScalaVersions := versionsJS,
scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((version, _)) =>
val a = (LocalRootProject / baseDirectory).value.toURI.toString
Expand All @@ -72,7 +63,6 @@ lazy val protobufRuntimeScala =
})
)
.nativeSettings(
crossScalaVersions := versionsNative,
nativeLinkStubs := true // for utest
)

Expand Down

0 comments on commit fd9bfc2

Please sign in to comment.