Skip to content

Commit 99cbc18

Browse files
rbscghstugots
and
stugots
authored
Build and publish only LTS scala 3 (#452)
* remove conflicting minor 3 versions * cleanup build.sbt --------- Co-authored-by: stugots <[email protected]>
1 parent f17a877 commit 99cbc18

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

build.sbt

+3-14
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ import sbt.CrossVersion
22

33
lazy val scala212 = "2.12.18"
44
lazy val scala213 = "2.13.14"
5-
lazy val scala3LTS = "3.3.4"
6-
lazy val scala3 = "3.6.3"
5+
lazy val scala3LTS = "3.3.5"
76

87
lazy val commonSettings = List(
98
scalaVersion := scala212,
@@ -42,7 +41,7 @@ lazy val codegen = (project in file("codegen"))
4241
lazy val runtime = (project in file("runtime")).settings(
4342
commonSettings,
4443
name := "twinagle-runtime",
45-
crossScalaVersions := Seq(scala212, scala213, scala3LTS, scala3),
44+
crossScalaVersions := Seq(scala212, scala213, scala3LTS),
4645
// finagle uses 2.13 heavily so we will ignore our project runtime compat
4746
excludeDependencies += "org.scala-lang.modules" % "scala-collection-compat_3",
4847
libraryDependencies ++= {
@@ -62,23 +61,13 @@ lazy val runtime = (project in file("runtime")).settings(
6261
)
6362
case Some((3, 3)) =>
6463
Seq(
65-
"org.scalamock" %% "scalamock" % "6.1.1" % Test
66-
)
67-
case Some((3, _)) =>
68-
Seq(
69-
"org.scalamock" %% "scalamock" % "7.1.0" % Test
64+
"org.scalamock" %% "scalamock" % "6.1.1" % Test
7065
)
7166
case _ => Seq.empty
7267
}
7368
},
7469
// compile protobuf messages for unit tests
7570
Project.inConfig(Test)(sbtprotoc.ProtocPlugin.protobufConfigSettings),
76-
Test / scalacOptions += {
77-
CrossVersion.partialVersion(scalaVersion.value) match {
78-
case Some((3, minor)) if minor > 3 => "-experimental"
79-
case _ => ""
80-
}
81-
},
8271
Test / PB.targets := {
8372
val gen3 = CrossVersion.partialVersion(scalaVersion.value).exists(a => a._1 == 3L)
8473
Seq(

0 commit comments

Comments
 (0)