Skip to content

Commit f2815d5

Browse files
mbovelkasiaMarek
andauthored
Update Scala to LARA Dotty 3.8.3 and SBT to 1.12.4 (#246)
Co-authored-by: Katarzyna Marek <kasia@marek.net>
1 parent cd57355 commit f2815d5

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

build.sbt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ git.useGitDescribe := true
66

77
organization := "ch.epfl.lara"
88

9-
val inoxScalaVersion = "3.7.2"
9+
val inoxScalaVersion = "3.8.3-RC1-bin-20260218-bb6fc60-NIGHTLY"
10+
val laraOrganization = "ch.epfl.lara"
11+
1012
scalaVersion := inoxScalaVersion
1113

1214
scalacOptions ++= Seq(
@@ -74,7 +76,7 @@ lazy val nTestParallelism = {
7476
def ghProject(repo: String, version: String) = RootProject(uri(s"${repo}#${version}"))
7577

7678
// lazy val smtlib = RootProject(file("../scala-smtlib")) // If you have a local copy of Scala-SMTLIB and would like to do some changes
77-
lazy val smtlib = ghProject("https://github.com/epfl-lara/scala-smtlib.git", "a8fc084fa48a59f0f58b6f3fba5433b8fe5eb280")
79+
lazy val smtlib = ghProject("https://github.com/epfl-lara/scala-smtlib.git", "6576aae292018b75634d884312fb919d3d5189b6")
7880

7981
lazy val scriptName = settingKey[String]("Name of the generated 'inox' script")
8082

@@ -154,6 +156,16 @@ lazy val ItTest = config("it") extend (Test)
154156
ItTest / testOptions := Seq(Tests.Argument("-oDF"))
155157

156158
lazy val root = (project in file("."))
159+
.settings(
160+
scalaOrganization := laraOrganization,
161+
// Scoped to root (not ThisBuild) to avoid propagating to the scala-smtlib
162+
// source dependency via https://github.com/sbt/sbt/issues/8821.
163+
excludeDependencies ++= Seq(
164+
ExclusionRule("org.scala-lang", "scala-library"),
165+
ExclusionRule("org.scala-lang", "scala3-library_3"),
166+
ExclusionRule("org.scala-lang", "scala3-compiler_3"),
167+
),
168+
)
157169
.configs(ItTest)
158170
.settings(Defaults.itSettings : _*)
159171
.settings(inConfig(Test)(Defaults.testTasks ++ Seq(

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.1
1+
sbt.version=1.12.4

0 commit comments

Comments
 (0)