Skip to content

Commit 3b4d47a

Browse files
committed
updated site
1 parent 3254c38 commit 3b4d47a

File tree

8 files changed

+52
-16
lines changed

8 files changed

+52
-16
lines changed

2.x/docs/en/changes/migrating-from-sbt-1.x.html

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,26 @@ <h2 id="cross-building-sbt-plugins"><a class="header" href="#cross-building-sbt-
213213
)
214214
.jvmPlatform(scalaVersions = Seq("3.3.3", "2.12.20"))
215215
</code></pre>
216-
<p>If you use <code>projectMatrix</code>, make sure to move the plugin to a subdirectory like <code>plugin/</code>. Otherwise, the synthetic root project will also pick up the <code>src/</code>.
217-
Use sbt 1.10.2 or later to cross build from sbt 1.x side.</p>
216+
<p>If you use <code>projectMatrix</code>, make sure to move the plugin to a subdirectory like <code>plugin/</code>. Otherwise, the synthetic root project will also pick up the <code>src/</code>.</p>
217+
<h3 id="cross-building-sbt-plugin-with-sbt-1x"><a class="header" href="#cross-building-sbt-plugin-with-sbt-1x">Cross building sbt plugin with sbt 1.x</a></h3>
218+
<p>Use sbt 1.10.2 or later, if you want to cross build using sbt 1.x.</p>
219+
<pre><code class="language-scala">// using sbt 1.x
220+
lazy val scala212 = "2.12.20"
221+
lazy val scala3 = "3.3.4"
222+
ThisBuild / crossScalaVersions := Seq(scala212, scala3)
223+
224+
lazy val plugin = (project in file("plugin"))
225+
.enablePlugins(SbtPlugin)
226+
.settings(
227+
name := "sbt-vimquit",
228+
(pluginCrossBuild / sbtVersion) := {
229+
scalaBinaryVersion.value match {
230+
case "2.12" =&gt; "1.5.8"
231+
case _ =&gt; "2.0.0-M2"
232+
}
233+
},
234+
)
235+
</code></pre>
218236
<h2 id="migrating-to-slash-syntax"><a class="header" href="#migrating-to-slash-syntax">Migrating to slash syntax</a></h2>
219237
<p>sbt 1.x supported both the sbt 0.13 style syntax and the slash syntax. sbt 2.x removes the support for the sbt 0.13 syntax, so use the slash syntax for both sbt shell and in <code>build.sbt</code>:</p>
220238
<pre><code class="language-scala">&lt;project-id&gt; / Config / intask / key

2.x/docs/en/guide/sbt-components.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ <h2 id="sbt-runner"><a class="header" href="#sbt-runner">sbt runner</a></h2>
180180
<p>An sbt build is executed using <code>sbt</code> runner, also called "sbt-the-shell-script" to distinguish from other components. It's important to note is that sbt runner is designed to run <strong>any version</strong> of sbt.</p>
181181
<h3 id="specifying-sbt-version-with-projectbuildproperties"><a class="header" href="#specifying-sbt-version-with-projectbuildproperties">Specifying sbt version with project/build.properties</a></h3>
182182
<p>sbt runner executes a subcomponent called sbt launcher, which reads <code>project/build.properties</code> to determine the sbt version for the build, and downloads the artifacts if they haven't been cached:</p>
183-
<pre><code>sbt.version=2.0.0-alpha7
183+
<pre><code>sbt.version=2.0.0-M2
184184
</code></pre>
185185
<p>This means that:</p>
186186
<ul>

2.x/docs/en/print.html

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,11 @@ <h3 id="create-a-minimum-sbt-build"><a class="header" href="#create-a-minimum-sb
236236
cd foo-build
237237
touch build.sbt
238238
mkdir project
239-
echo "sbt.version=2.0.0-alpha7" &gt; project/build.properties
239+
echo "sbt.version=2.0.0-M2" &gt; project/build.properties
240240
</code></pre>
241241
<h3 id="start-sbt-shell"><a class="header" href="#start-sbt-shell">Start sbt shell</a></h3>
242242
<pre><code class="language-bash">$ sbt
243-
[info] welcome to sbt 2.0.0-alpha7 (Azul Systems, Inc. Java)
243+
[info] welcome to sbt 2.0.0-M2 (Azul Systems, Inc. Java)
244244
....
245245
[info] started sbt server
246246
sbt:foo-build&gt;
@@ -868,7 +868,7 @@ <h2 id="sbt-runner"><a class="header" href="#sbt-runner">sbt runner</a></h2>
868868
<p>An sbt build is executed using <code>sbt</code> runner, also called "sbt-the-shell-script" to distinguish from other components. It's important to note is that sbt runner is designed to run <strong>any version</strong> of sbt.</p>
869869
<h3 id="specifying-sbt-version-with-projectbuildproperties"><a class="header" href="#specifying-sbt-version-with-projectbuildproperties">Specifying sbt version with project/build.properties</a></h3>
870870
<p>sbt runner executes a subcomponent called sbt launcher, which reads <code>project/build.properties</code> to determine the sbt version for the build, and downloads the artifacts if they haven't been cached:</p>
871-
<pre><code>sbt.version=2.0.0-alpha7
871+
<pre><code>sbt.version=2.0.0-M2
872872
</code></pre>
873873
<p>This means that:</p>
874874
<ul>
@@ -1478,8 +1478,26 @@ <h2 id="cross-building-sbt-plugins"><a class="header" href="#cross-building-sbt-
14781478
)
14791479
.jvmPlatform(scalaVersions = Seq("3.3.3", "2.12.20"))
14801480
</code></pre>
1481-
<p>If you use <code>projectMatrix</code>, make sure to move the plugin to a subdirectory like <code>plugin/</code>. Otherwise, the synthetic root project will also pick up the <code>src/</code>.
1482-
Use sbt 1.10.2 or later to cross build from sbt 1.x side.</p>
1481+
<p>If you use <code>projectMatrix</code>, make sure to move the plugin to a subdirectory like <code>plugin/</code>. Otherwise, the synthetic root project will also pick up the <code>src/</code>.</p>
1482+
<h3 id="cross-building-sbt-plugin-with-sbt-1x"><a class="header" href="#cross-building-sbt-plugin-with-sbt-1x">Cross building sbt plugin with sbt 1.x</a></h3>
1483+
<p>Use sbt 1.10.2 or later, if you want to cross build using sbt 1.x.</p>
1484+
<pre><code class="language-scala">// using sbt 1.x
1485+
lazy val scala212 = "2.12.20"
1486+
lazy val scala3 = "3.3.4"
1487+
ThisBuild / crossScalaVersions := Seq(scala212, scala3)
1488+
1489+
lazy val plugin = (project in file("plugin"))
1490+
.enablePlugins(SbtPlugin)
1491+
.settings(
1492+
name := "sbt-vimquit",
1493+
(pluginCrossBuild / sbtVersion) := {
1494+
scalaBinaryVersion.value match {
1495+
case "2.12" =&gt; "1.5.8"
1496+
case _ =&gt; "2.0.0-M2"
1497+
}
1498+
},
1499+
)
1500+
</code></pre>
14831501
<h2 id="migrating-to-slash-syntax"><a class="header" href="#migrating-to-slash-syntax">Migrating to slash syntax</a></h2>
14841502
<p>sbt 1.x supported both the sbt 0.13 style syntax and the slash syntax. sbt 2.x removes the support for the sbt 0.13 syntax, so use the slash syntax for both sbt shell and in <code>build.sbt</code>:</p>
14851503
<pre><code class="language-scala">&lt;project-id&gt; / Config / intask / key
@@ -1606,7 +1624,7 @@ <h3 id="sbt-runner-and-sbt-server"><a class="header" href="#sbt-runner-and-sbt-s
16061624
</ul>
16071625
</li>
16081626
</ul>
1609-
<pre><code>sbt.version=2.0.0-alpha7
1627+
<pre><code>sbt.version=2.0.0-M2
16101628
</code></pre>
16111629
<p>This mechanism allows builds to be configured to a specific version of sbt, and everyone working on the project would use the same build semantics, regardless of the sbt runner installed on their machine.</p>
16121630
<p>This also means that some features are implemented at sbt runner or sbtn level, while other features are implemented at sbt server level.</p>
@@ -2349,7 +2367,7 @@ <h2 id="steps"><a class="header" href="#steps">Steps</a></h2>
23492367
<ol>
23502368
<li>Create a fresh directory, like <code>hello_scala/</code></li>
23512369
<li>Create a directory named <code>project/</code> under <code>hello_scala/</code>, and create <code>project/build.properties</code> with
2352-
<pre><code>sbt.version=2.0.0-alpha7
2370+
<pre><code>sbt.version=2.0.0-M2
23532371
</code></pre>
23542372
</li>
23552373
<li>Under <code>hello_scala/</code>, create <code>build.sbt</code>:

2.x/docs/en/recipes/hello-world.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ <h2 id="steps"><a class="header" href="#steps">Steps</a></h2>
182182
<ol>
183183
<li>Create a fresh directory, like <code>hello_scala/</code></li>
184184
<li>Create a directory named <code>project/</code> under <code>hello_scala/</code>, and create <code>project/build.properties</code> with
185-
<pre><code>sbt.version=2.0.0-alpha7
185+
<pre><code>sbt.version=2.0.0-M2
186186
</code></pre>
187187
</li>
188188
<li>Under <code>hello_scala/</code>, create <code>build.sbt</code>:

2.x/docs/en/reference/sbt.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ <h3 id="sbt-runner-and-sbt-server"><a class="header" href="#sbt-runner-and-sbt-s
198198
</ul>
199199
</li>
200200
</ul>
201-
<pre><code>sbt.version=2.0.0-alpha7
201+
<pre><code>sbt.version=2.0.0-M2
202202
</code></pre>
203203
<p>This mechanism allows builds to be configured to a specific version of sbt, and everyone working on the project would use the same build semantics, regardless of the sbt runner installed on their machine.</p>
204204
<p>This also means that some features are implemented at sbt runner or sbtn level, while other features are implemented at sbt server level.</p>

2.x/docs/en/sbt-by-example.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,11 @@ <h3 id="create-a-minimum-sbt-build"><a class="header" href="#create-a-minimum-sb
183183
cd foo-build
184184
touch build.sbt
185185
mkdir project
186-
echo "sbt.version=2.0.0-alpha7" &gt; project/build.properties
186+
echo "sbt.version=2.0.0-M2" &gt; project/build.properties
187187
</code></pre>
188188
<h3 id="start-sbt-shell"><a class="header" href="#start-sbt-shell">Start sbt shell</a></h3>
189189
<pre><code class="language-bash">$ sbt
190-
[info] welcome to sbt 2.0.0-alpha7 (Azul Systems, Inc. Java)
190+
[info] welcome to sbt 2.0.0-M2 (Azul Systems, Inc. Java)
191191
....
192192
[info] started sbt server
193193
sbt:foo-build&gt;

2.x/docs/en/searchindex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

2.x/docs/en/searchindex.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)