Skip to content

Commit 8378849

Browse files
committed
Cutover to sbt 2.x
1 parent d82305b commit 8378849

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

‎project/build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
sbt.version=1.13.0
1+
sbt.version=2.0.7
22
//2.0.4
33
//9
44
//1.12.2

‎project/plugins.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//Not working with sbt 2
22
//addDependencyTreePlugin
3-
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.11.0") //No longer needed in sbt 2.x
3+
//addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.11.0") //No longer needed in sbt 2.x
44
//addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1") //Not working with sbt 2.x
55
//addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.2") //Not working with sbt 2.x. PR is open
66
//addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.10") //Not working with sbt 2.x. PR has landed.

‎project/scalapb.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.1.0-RC2")
22
//0.1.0-SNAPSHOT")
33
excludeDependencies ++= Seq(
4-
ExclusionRule("com.thesamet.scalapb", "protoc-bridge_3"),
4+
ExclusionRule("com.thesamet.scalapb", "protoc-bridge_2.12"),
55
ExclusionRule("com.thesamet.scalapb", "protoc-bridge_2.13"),
66
ExclusionRule("org.scala-lang.modules", "scala-collection-compat_3"),
77
ExclusionRule("org.scala-lang.modules", "scala-collection-compat_2.13")

0 commit comments

Comments
 (0)