Skip to content

Commit 1ea06a4

Browse files
hamzaremmalhamzaremmal
committed
fix: update scala version of each project
1 parent bb08459 commit 1ea06a4

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

‎project/Build.scala‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@ object Build {
981981
moduleName := "scala3-staging",
982982
version := dottyVersion,
983983
versionScheme := Some("semver-spec"),
984-
scalaVersion := referenceVersion,
984+
scalaVersion := dottyNonBootstrappedVersion,
985985
crossPaths := true, // org.scala-lang:scala3-staging has a crosspath
986986
autoScalaLibrary := false, // do not add a dependency to stdlib, we depend transitively on the stdlib from `scala3-compiler-bootstrapped`
987987
// Add the source directories for the sbt-bridge (boostrapped)
@@ -995,6 +995,7 @@ object Build {
995995
Test / publishArtifact := false,
996996
publish / skip := false,
997997
// Configure to use the non-bootstrapped compiler
998+
managedScalaInstance := false,
998999
scalaInstance := {
9991000
val externalCompilerDeps = (`scala3-compiler-nonbootstrapped` / Compile / externalDependencyClasspath).value.map(_.data).toSet
10001001

@@ -1035,7 +1036,7 @@ object Build {
10351036
moduleName := "scala3-tasty-inspector",
10361037
version := dottyVersion,
10371038
versionScheme := Some("semver-spec"),
1038-
scalaVersion := referenceVersion,
1039+
scalaVersion := dottyNonBootstrappedVersion,
10391040
crossPaths := true, // org.scala-lang:scala3-tasty-inspector has a crosspath
10401041
autoScalaLibrary := false, // do not add a dependency to stdlib, we depend transitively on the stdlib from `scala3-compiler-bootstrapped`
10411042
// Add the source directories for the sbt-bridge (boostrapped)
@@ -1050,6 +1051,7 @@ object Build {
10501051
Test / publishArtifact := false,
10511052
publish / skip := false,
10521053
// Configure to use the non-bootstrapped compiler
1054+
managedScalaInstance := false,
10531055
scalaInstance := {
10541056
val externalCompilerDeps = (`scala3-compiler-nonbootstrapped` / Compile / externalDependencyClasspath).value.map(_.data).toSet
10551057

@@ -1086,7 +1088,7 @@ object Build {
10861088
moduleName := "scala3-repl",
10871089
version := dottyVersion,
10881090
versionScheme := Some("semver-spec"),
1089-
scalaVersion := referenceVersion,
1091+
scalaVersion := dottyNonBootstrappedVersion,
10901092
crossPaths := true,
10911093
autoScalaLibrary := false,
10921094
// Add the source directories for the sbt-bridge (boostrapped)
@@ -1113,6 +1115,7 @@ object Build {
11131115
"org.virtuslab" % "using_directives" % "1.1.4", // used by the REPL for parsing magic comments
11141116
),
11151117
// Configure to use the non-bootstrapped compiler
1118+
managedScalaInstance := false,
11161119
scalaInstance := {
11171120
val externalCompilerDeps = (`scala3-compiler-nonbootstrapped` / Compile / externalDependencyClasspath).value.map(_.data).toSet
11181121

@@ -1283,7 +1286,7 @@ object Build {
12831286
versionScheme := Some("always"),
12841287
// sbt defaults to scala 2.12.x and metals will report issues as it doesn't consider the project a scala 3 project
12851288
// (not the actual version we use to compile the project)
1286-
scalaVersion := referenceVersion,
1289+
scalaVersion := dottyNonBootstrappedVersion,
12871290
crossPaths := false, // org.scala-lang:scala-library doesn't have a crosspath
12881291
autoScalaLibrary := false, // DO NOT DEPEND ON THE STDLIB, IT IS THE STDLIB
12891292
// Add the source directories for the stdlib (non-boostrapped)
@@ -1355,7 +1358,7 @@ object Build {
13551358
versionScheme := Some("semver-spec"),
13561359
// sbt defaults to scala 2.12.x and metals will report issues as it doesn't consider the project a scala 3 project
13571360
// (not the actual version we use to compile the project)
1358-
scalaVersion := referenceVersion,
1361+
scalaVersion := dottyNonBootstrappedVersion,
13591362
crossPaths := true, // org.scala-lang:scala3-library has a crosspath
13601363
// Do not depend on the `org.scala-lang:scala3-library` automatically, we manually depend on `scala-library-bootstrapped`
13611364
autoScalaLibrary := false,
@@ -1415,7 +1418,7 @@ object Build {
14151418
crossVersion := CrossVersion.disabled,
14161419
// sbt defaults to scala 2.12.x and metals will report issues as it doesn't consider the project a scala 3 project
14171420
// (not the actual version we use to compile the project)
1418-
scalaVersion := referenceVersion,
1421+
scalaVersion := dottyNonBootstrappedVersion,
14191422
// Add the source directories for the stdlib (non-boostrapped)
14201423
Compile / unmanagedSourceDirectories := Seq(baseDirectory.value / "src"),
14211424
Compile / unmanagedSourceDirectories ++=
@@ -1528,7 +1531,7 @@ object Build {
15281531
versionScheme := Some("semver-spec"),
15291532
// sbt defaults to scala 2.12.x and metals will report issues as it doesn't consider the project a scala 3 project
15301533
// (not the actual version we use to compile the project)
1531-
scalaVersion := referenceVersion,
1534+
scalaVersion := dottyNonBootstrappedVersion,
15321535
crossPaths := true, // org.scala-lang:scala3-library_sjs1 has a crosspath
15331536
// Do not depend on the `org.scala-lang:scala3-library` automatically, we manually depend on `scala-library-bootstrapped`
15341537
autoScalaLibrary := false,
@@ -1630,7 +1633,7 @@ object Build {
16301633
moduleName := "tasty-core",
16311634
version := dottyVersion,
16321635
versionScheme := Some("semver-spec"),
1633-
scalaVersion := referenceVersion, // nonbootstrapped artifacts are compiled with the reference compiler (already officially published)
1636+
scalaVersion := dottyNonBootstrappedVersion,
16341637
crossPaths := true, // org.scala-lang:tasty-core has a crosspath
16351638
// sbt shouldn't add stdlib automatically, we depend on `scala3-library-nonbootstrapped`
16361639
autoScalaLibrary := false,
@@ -1653,6 +1656,7 @@ object Build {
16531656
// Project specific target folder. sbt doesn't like having two projects using the same target folder
16541657
target := target.value / "tasty-core-bootstrapped",
16551658
// Configure to use the non-bootstrapped compiler
1659+
managedScalaInstance := false,
16561660
scalaInstance := {
16571661
val externalCompilerDeps = (`scala3-compiler-nonbootstrapped` / Compile / externalDependencyClasspath).value.map(_.data).toSet
16581662

@@ -1700,7 +1704,7 @@ object Build {
17001704
moduleName := "scala3-compiler",
17011705
version := dottyNonBootstrappedVersion,
17021706
versionScheme := Some("semver-spec"),
1703-
scalaVersion := dottyNonBootstrappedVersion, // nonbootstrapped artifacts are compiled with the reference compiler (already officially published)
1707+
scalaVersion := referenceVersion, // nonbootstrapped artifacts are compiled with the reference compiler (already officially published)
17041708
crossPaths := true, // org.scala-lang:scala3-compiler has a crosspath
17051709
// sbt shouldn't add stdlib automatically, we depend on `scala3-library-nonbootstrapped`
17061710
autoScalaLibrary := false,
@@ -1843,7 +1847,7 @@ object Build {
18431847
moduleName := "scala3-compiler",
18441848
version := dottyVersion,
18451849
versionScheme := Some("semver-spec"),
1846-
scalaVersion := referenceVersion, // nonbootstrapped artifacts are compiled with the reference compiler (already officially published)
1850+
scalaVersion := dottyNonBootstrappedVersion,
18471851
crossPaths := true, // org.scala-lang:scala3-compiler has a crosspath
18481852
// sbt shouldn't add stdlib automatically, we depend on `scala3-library-nonbootstrapped`
18491853
autoScalaLibrary := false,
@@ -1994,7 +1998,7 @@ object Build {
19941998
moduleName := "scaladoc",
19951999
version := dottyVersion,
19962000
versionScheme := Some("semver-spec"),
1997-
scalaVersion := referenceVersion, // nonbootstrapped artifacts are compiled with the reference compiler (already officially published)
2001+
scalaVersion := dottyNonBootstrappedVersion,
19982002
crossPaths := true, // org.scala-lang:scaladoc has a crosspath
19992003
// sbt shouldn't add stdlib automatically, we depend on `scala3-library-nonbootstrapped`
20002004
autoScalaLibrary := false,
@@ -2028,6 +2032,7 @@ object Build {
20282032
BuildInfoPlugin.buildInfoScopedSettings(Compile),
20292033
BuildInfoPlugin.buildInfoDefaultSettings,
20302034
// Configure to use the non-bootstrapped compiler
2035+
managedScalaInstance := false,
20312036
scalaInstance := {
20322037
val externalCompilerDeps = (`scala3-compiler-nonbootstrapped` / Compile / externalDependencyClasspath).value.map(_.data).toSet
20332038

0 commit comments

Comments
 (0)