Skip to content

Commit 727e67f

Browse files
ShreckYelefou
andauthored
Replace uppercase "SBT" with lowercase "sbt", and update some links to https BTW (#4706)
The lowercase spelling "sbt" seems to be the official spelling used in their docs and other places. Shall we replace the uppercase "SBT"s with this instead? This is done for all occurences of "SBT" except for the link http://www.lihaoyi.com/post/SowhatswrongwithSBT.html which will be broken if updated. Pull Request: #4706 --------- Co-authored-by: Tobias Roeser <[email protected]>
1 parent bdd60a7 commit 727e67f

File tree

26 files changed

+125
-126
lines changed

26 files changed

+125
-126
lines changed

changelog.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ frameworks, etc.)
327327
6. The Mill doc-site at https://mill-build.org/ has undergone a massive overhaul.
328328
New comparisons with other build tools of (https://mill-build.org/mill/comparisons/maven.html[Maven],
329329
https://mill-build.org/mill/comparisons/gradle.html[Gradle],
330-
https://mill-build.org/mill/comparisons/sbt.html[SBT]), documentation for
330+
https://mill-build.org/mill/comparisons/sbt.html[`sbt`]), documentation for
331331
https://mill-build.org/mill/extending/new-language.html[adding new language toolchains]
332332
and https://mill-build.org/mill/extending/running-jvm-code.html[running dynamic JVM code],
333333
and re-organized the pages for Scala/Java/Kotlin by-use-case to make them more navigable

example/fundamentals/cross/10-static-blog/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,4 +138,4 @@ def dist = Task {
138138
// This example use case is taken from the following blog post, which contains
139139
// some extensions and fun exercises to further familiarize yourself with Mill
140140
//
141-
// * http://www.lihaoyi.com/post/HowtocreateBuildPipelinesinScala.html[How to create Build Pipelines in Scala]
141+
// * https://www.lihaoyi.com/post/HowtocreateBuildPipelinesinScala.html[How to create Build Pipelines in Scala]

example/javalib/basic/4-compat-modules/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ object foo extends MavenModule {
1313
}
1414

1515
// `MavenModule` is a variant of `JavaModule`
16-
// that uses the more verbose folder layout of Maven, SBT, and other tools:
16+
// that uses the more verbose folder layout of Maven, `sbt`, and other tools:
1717
//
1818
// - `foo/src/main/java`
1919
// - `foo/src/test/java`

example/kotlinlib/basic/4-compat-modules/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ object foo extends KotlinModule with KotlinMavenModule {
2020
}
2121

2222
// `KotlinMavenModule` is a variant of `KotlinModule`
23-
// that uses the more verbose folder layout of Maven, SBT, and other tools:
23+
// that uses the more verbose folder layout of Maven, `sbt`, and other tools:
2424
//
2525
// - `foo/src/main/java`
2626
// - `foo/src/main/kotlin`

example/scalalib/basic/1-simple/build.mill

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ object foo extends ScalaModule {
5959
// ...
6060
// ----
6161
//
62-
// NOTE: The default Mill source folder layout `foo/src/` differs from that of SBT's
62+
// NOTE: The default Mill source folder layout `foo/src/` differs from that of `sbt`'s
6363
// `foo/src/main/scala`.
64-
// If you wish to use the SBT source folder layout, e.g. for migrating
64+
// If you wish to use the `sbt` source folder layout, e.g. for migrating
6565
// an existing codebase, you should use
66-
// xref:#_sbt_compatible_modules[SBT-Compatible Modules]
66+
// xref:#_sbt_compatible_modules[`sbt`-Compatible Modules]
6767
//
6868
//// SNIPPET:END
6969
//

example/scalalib/basic/4-compat-modules/build.mill

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//// SNIPPET:ALL
22
// Mill's default folder layout of `foo/src/` and `foo/test/src` differs from that
3-
// of SBT's `foo/src/main/scala/` and `foo/src/test/scala/`. If you are
4-
// migrating an existing codebase from SBT, you can use Mill's `SbtModule` and
3+
// of `sbt`'s `foo/src/main/scala/` and `foo/src/test/scala/`. If you are
4+
// migrating an existing codebase from `sbt`, you can use Mill's `SbtModule` and
55
// `SbtTests` as shown below to preserve filesystem compatibility with an existing
6-
// SBT build:
6+
// `sbt` build:
77

88
package build
99
import mill._, scalalib._
@@ -25,7 +25,7 @@ trait BarModule extends CrossSbtModule {
2525
}
2626

2727
// `SbtModule`/`CrossSbtModule` are variants of `ScalaModule`/`CrossScalaModule`
28-
// that use the more verbose folder layout of SBT, Maven, and other tools:
28+
// that use the more verbose folder layout of `sbt`, Maven, and other tools:
2929
//
3030
// - `foo/src/main/scala`
3131
// - `foo/src/main/scala-2.12`
@@ -39,8 +39,8 @@ trait BarModule extends CrossSbtModule {
3939
// - `foo/src-2.13`
4040
// - `foo/test/src`
4141
//
42-
// This is especially useful if you are migrating from SBT to Mill (or vice
43-
// versa), during which a particular module may be built using both SBT and
42+
// This is especially useful if you are migrating from `sbt` to Mill (or vice
43+
// versa), during which a particular module may be built using both `sbt` and
4444
// Mill at the same time
4545

4646
/** Usage

example/scalalib/testing/2-test-deps/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// --
55
//
66
// You might be used to test-scoped dependencies from other build tools like
7-
// Maven, Gradle or SBT. As test modules in Mill are just regular modules,
7+
// Maven, Gradle or `sbt`. As test modules in Mill are just regular modules,
88
// there is no special need for a dedicated test-scope. You can use `ivyDeps`
99
// and `runIvyDeps` to declare dependencies in test modules, and test modules
1010
// can use their `moduleDeps` to also depend on each other

integration/migrating/init/src/MillInitSbtTests.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import scala.collection.immutable.SortedSet
1010
object MillInitSbtUtils {
1111

1212
/**
13-
* bump sbt version to our tested version to resolve compatibility issues with lower sbt versions and higher JDK versions
13+
* bump `sbt` version to our tested version to resolve compatibility issues with lower `sbt` versions and higher JDK versions
1414
*/
1515
def bumpSbt(workspacePath: os.Path) =
1616
os.write.over(
@@ -27,7 +27,7 @@ object MillInitScala3ExampleProjectTests extends BuildGenTestSuite {
2727
def tests: Tests = Tests {
2828
/*
2929
- 17 KB
30-
- sbt 1.10.7
30+
- `sbt` 1.10.7
3131
*/
3232
val url =
3333
"https://github.com/scala/scala3-example-project/archive/853808c50601e88edaa7272bcfb887b96be0e22a.zip"
@@ -51,7 +51,7 @@ object MillInitSbtScalaCsv200Tests extends BuildGenTestSuite {
5151
def tests: Tests = Tests {
5252
/*
5353
- 34 KB
54-
- originally sbt 1.10.0
54+
- originally `sbt` 1.10.0
5555
*/
5656
val url = "https://github.com/tototoshi/scala-csv/archive/refs/tags/2.0.0.zip"
5757

@@ -78,7 +78,7 @@ object MillInitSbtScalaCsv136Tests extends BuildGenTestSuite {
7878
def tests: Tests = Tests {
7979
/*
8080
- 28 KB
81-
- originally sbt 1.2.8
81+
- originally `sbt` 1.2.8
8282
*/
8383
val url = "https://github.com/tototoshi/scala-csv/archive/refs/tags/1.3.6.zip"
8484

@@ -106,7 +106,7 @@ object MillInitSbtMultiProjectExampleTests extends BuildGenTestSuite {
106106
def tests: Tests = Tests {
107107
/*
108108
- 12 KB
109-
- originally sbt 1.0.2
109+
- originally `sbt` 1.0.2
110110
*/
111111
val url =
112112
"https://github.com/pbassiner/sbt-multi-project-example/archive/152b31df9837115b183576b0080628b43c505389.zip"
@@ -156,7 +156,7 @@ object MillInitSbtGatlingTests extends BuildGenTestSuite {
156156
def tests: Tests = Tests {
157157
/*
158158
- 1.8 MB
159-
- sbt 1.10.7
159+
- `sbt` 1.10.7
160160
*/
161161
val url =
162162
"https://github.com/gatling/gatling/archive/711b8d4e7ac7aaa8d3173b2d77fb5e9c7843695a.zip"
@@ -250,13 +250,13 @@ object MillInitSbtGatlingTests extends BuildGenTestSuite {
250250
/*
251251
`java.util.MissingResourceException: Can't find bundle for base name gatling-version, locale ...`
252252
The version file in resources `gatling-commons/src/main/resources/gatling-version.properties`
253-
is generated by a custom sbt task `generateVersionFileSettings`
253+
is generated by a custom `sbt` task `generateVersionFileSettings`
254254
and therefore missing after conversion.
255255
*/
256256
//
257257
"gatling-charts.test"
258258
) ++ (if (Util.isWindows)
259-
// This fails on Windows with sbt too.
259+
// This fails on Windows with `sbt` too.
260260
Seq("gatling-core.test")
261261
else Seq.empty)
262262
))

main/init/buildgen/src/mill/main/buildgen/BuildGenBase.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ trait BuildGenBase[M, D, I] {
2020

2121
/**
2222
* A [[Map]] mapping from a key retrieved from the original build tool
23-
* (for example, the GAV coordinate for Maven, `ProjectRef.project` for sbt)
23+
* (for example, the GAV coordinate for Maven, `ProjectRef.project` for `sbt`)
2424
* to the module FQN reference string in code such as `parentModule.childModule`.
2525
*
2626
* If there is no need for such a map, override it with [[Unit]].

main/init/buildgen/src/mill/main/buildgen/BuildGenUtil.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ object BuildGenUtil {
7474
val declare =
7575
BuildGenUtil.renderTestModuleDecl(testModule, testModuleMainType, scopedDeps.testModule)
7676

77-
// `testSandboxWorkingDir` is disabled as other build tools such as sbt don't run tests in the sandbox.
77+
// `testSandboxWorkingDir` is disabled as other build tools such as `sbt` don't run tests in the sandbox.
7878
s"""$declare {
7979
|
8080
|${renderBomIvyDeps(scopedDeps.testBomIvyDeps)}

0 commit comments

Comments
 (0)