Skip to content

Commit 88a90fc

Browse files
Rename sbt-dotty to sbt-scala3
1 parent f395ca9 commit 88a90fc

File tree

935 files changed

+16
-16
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

935 files changed

+16
-16
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ val sjsSandbox = Build.sjsSandbox
2828
val sjsJUnitTests = Build.sjsJUnitTests
2929
val sjsCompilerTests = Build.sjsCompilerTests
3030

31-
val `sbt-dotty` = Build.`sbt-dotty`
31+
val `sbt-scala3` = Build.`sbt-scala3`
3232
val `vscode-dotty` = Build.`vscode-dotty`
3333

3434
inThisBuild(Build.thisBuildSettings)

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ lazy val compilerVersion: String =
1717
lazy val sbtPluginFilePath: String =
1818
// Workaround for https://github.com/sbt/sbt/issues/4395
1919
new File(sys.props("user.home") + "/.sbt/1.0/plugins").mkdirs()
20-
communitybuildDir.resolve("sbt-dotty-sbt").toAbsolutePath().toString()
20+
communitybuildDir.resolve("sbt-scala3-sbt").toAbsolutePath().toString()
2121

2222
def log(msg: String) = println(Console.GREEN + msg + Console.RESET)
2323

@@ -344,7 +344,7 @@ class CommunityBuildTest:
344344
/** Build the given project with the published local compiler and sbt plugin.
345345
*
346346
* This test reads the compiler version from community-build/dotty-bootstrapped.version
347-
* and expects community-build/sbt-dotty-sbt to set the compiler plugin.
347+
* and expects community-build/sbt-scala3-sbt to set the compiler plugin.
348348
*
349349
* @param project The project name, should be a git submodule in community-build/
350350
* @param command The binary file of the program used to test the project – usually

project/Build.scala

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ object Build {
9393
}
9494
val dottyNonBootstrappedVersion = dottyVersion + "-nonbootstrapped"
9595

96-
val sbtDottyName = "sbt-dotty"
96+
val sbtDottyName = "sbt-scala3"
9797
val sbtDottyVersion = {
9898
if (isRelease) baseSbtDottyVersion else baseSbtDottyVersion + "-SNAPSHOT"
9999
}
@@ -155,7 +155,7 @@ object Build {
155155

156156
javacOptions in (Compile, compile) ++= Seq("-Xlint:unchecked", "-Xlint:deprecation"),
157157

158-
// Override `runCode` from sbt-dotty to use the language-server and
158+
// Override `runCode` from sbt-scala3 to use the language-server and
159159
// vscode extension from the source repository of dotty instead of a
160160
// published version.
161161
runCode := (run in `scala3-language-server`).toTask("").value,
@@ -326,7 +326,7 @@ object Build {
326326
allJars
327327
)
328328
},
329-
// sbt-dotty defines `scalaInstance in doc` so we need to override it manually
329+
// sbt-scala3 defines `scalaInstance in doc` so we need to override it manually
330330
scalaInstance in doc := scalaInstance.value,
331331
)
332332

@@ -396,7 +396,7 @@ object Build {
396396
val dottydocExtraArgs = spaceDelimited("<arg>").parsed
397397

398398
// Make majorVersion available at dotty.epfl.ch/versions/latest-nightly-base
399-
// Used by sbt-dotty to resolve the latest nightly
399+
// Used by sbt-scala3 to resolve the latest nightly
400400
val majorVersion = baseVersion.take(baseVersion.lastIndexOf('.'))
401401
IO.write(file("./docs/_site/versions/latest-nightly-base"), majorVersion)
402402

@@ -786,7 +786,7 @@ object Build {
786786
lazy val `scala3-staging` = project.in(file("staging")).
787787
withCommonSettings(Bootstrapped).
788788
// We want the compiler to be present in the compiler classpath when compiling this project but not
789-
// when compiling a project that depends on scala3-staging (see sbt-dotty/sbt-test/sbt-dotty/quoted-example-project),
789+
// when compiling a project that depends on scala3-staging (see sbt-scala3/sbt-test/sbt-dotty/quoted-example-project),
790790
// but we always need it to be present on the JVM classpath at runtime.
791791
dependsOn(dottyCompiler(Bootstrapped) % "provided; compile->runtime; test->test").
792792
settings(commonBootstrappedSettings).
@@ -797,7 +797,7 @@ object Build {
797797
lazy val `scala3-tasty-inspector` = project.in(file("tasty-inspector")).
798798
withCommonSettings(Bootstrapped).
799799
// We want the compiler to be present in the compiler classpath when compiling this project but not
800-
// when compiling a project that depends on scala3-tasty-inspector (see sbt-dotty/sbt-test/sbt-dotty/tasty-inspector-example-project),
800+
// when compiling a project that depends on scala3-tasty-inspector (see sbt-scala3/sbt-test/sbt-dotty/tasty-inspector-example-project),
801801
// but we always need it to be present on the JVM classpath at runtime.
802802
dependsOn(dottyCompiler(Bootstrapped) % "provided; compile->runtime; test->test").
803803
settings(commonBootstrappedSettings).
@@ -844,9 +844,9 @@ object Build {
844844
dependsOn(dottyCompiler(Bootstrapped)).
845845
settings(commonBootstrappedSettings).
846846
settings(
847-
// Sources representing the shared configuration file used to communicate between the sbt-dotty
847+
// Sources representing the shared configuration file used to communicate between the sbt-scala3
848848
// plugin and the language server
849-
unmanagedSourceDirectories in Compile += baseDirectory.value / "../sbt-dotty/src/dotty/tools/sbtplugin/config",
849+
unmanagedSourceDirectories in Compile += baseDirectory.value / "../sbt-scala3/src/dotty/tools/sbtplugin/config",
850850

851851
libraryDependencies ++= Seq(
852852
"org.eclipse.lsp4j" % "org.eclipse.lsp4j" % "0.6.0",
@@ -1114,13 +1114,13 @@ object Build {
11141114

11151115
// sbt plugin to use Dotty in your own build, see
11161116
// https://github.com/lampepfl/scala3-example-project for usage.
1117-
lazy val `sbt-dotty` = project.in(file("sbt-dotty")).
1117+
lazy val `sbt-scala3` = project.in(file("sbt-scala3")).
11181118
enablePlugins(SbtPlugin).
11191119
settings(commonSettings).
11201120
settings(
11211121
name := sbtDottyName,
11221122
version := sbtDottyVersion,
1123-
// Keep in sync with inject-sbt-dotty.sbt
1123+
// Keep in sync with inject-sbt-scala3.sbt
11241124
libraryDependencies ++= Seq(
11251125
Dependencies.`jackson-databind`,
11261126
Dependencies.`compiler-interface`
@@ -1220,13 +1220,13 @@ object Build {
12201220
(publishLocal in `scala3-library-bootstrapped`).value
12211221
(publishLocal in `scala3-doc-bootstrapped`).value
12221222
(publishLocal in `scala3-compiler-bootstrapped`).value
1223-
(publishLocal in `sbt-dotty`).value
1223+
(publishLocal in `sbt-scala3`).value
12241224
(publishLocal in `scala3-bootstrapped`).value
12251225
(publishLocal in `scala3-library-bootstrappedJS`).value
12261226
// (publishLocal in `scala3-staging`).value
12271227
val pluginText =
12281228
s"""updateOptions in Global ~= (_.withLatestSnapshots(false))
1229-
|addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "$sbtDottyVersion")""".stripMargin
1229+
|addSbtPlugin("org.scala-lang" % "sbt-scala3" % "$sbtDottyVersion")""".stripMargin
12301230
IO.write(baseDirectory.value / "sbt-scala3-sbt", pluginText)
12311231
IO.write(baseDirectory.value / "scala3-bootstrapped.version", dottyVersion)
12321232
},

project/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ libraryDependencies += "org.eclipse.jgit" % "org.eclipse.jgit" % "4.11.0.2018030
55
// so that we can use the current in-development version of the plugin
66
// in our build instead of a released version.
77

8-
unmanagedSourceDirectories in Compile += baseDirectory.value / "../sbt-dotty/src"
8+
unmanagedSourceDirectories in Compile += baseDirectory.value / "../sbt-scala3/src"
99

1010
// Keep in sync with `sbt-dotty` config in Build.scala
1111
libraryDependencies ++= Seq(

0 commit comments

Comments
 (0)