@@ -2,8 +2,7 @@ import sbt.CrossVersion
2
2
3
3
lazy val scala212 = " 2.12.18"
4
4
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"
7
6
8
7
lazy val commonSettings = List (
9
8
scalaVersion := scala212,
@@ -42,7 +41,7 @@ lazy val codegen = (project in file("codegen"))
42
41
lazy val runtime = (project in file(" runtime" )).settings(
43
42
commonSettings,
44
43
name := " twinagle-runtime" ,
45
- crossScalaVersions := Seq (scala212, scala213, scala3LTS, scala3 ),
44
+ crossScalaVersions := Seq (scala212, scala213, scala3LTS),
46
45
// finagle uses 2.13 heavily so we will ignore our project runtime compat
47
46
excludeDependencies += " org.scala-lang.modules" % " scala-collection-compat_3" ,
48
47
libraryDependencies ++= {
@@ -62,23 +61,13 @@ lazy val runtime = (project in file("runtime")).settings(
62
61
)
63
62
case Some ((3 , 3 )) =>
64
63
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
70
65
)
71
66
case _ => Seq .empty
72
67
}
73
68
},
74
69
// compile protobuf messages for unit tests
75
70
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
- },
82
71
Test / PB .targets := {
83
72
val gen3 = CrossVersion .partialVersion(scalaVersion.value).exists(a => a._1 == 3L )
84
73
Seq (
0 commit comments