Skip to content

Commit 604b354

Browse files
authored
Merge pull request #2966 from lrytz/mgs3
Add page about Scala 2 `-Xsource:3` to migration guide
2 parents 42a6e8e + 4297425 commit 604b354

25 files changed

+122
-36
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@
44

55
This repository contains the source for the Scala documentation website, as well as the source for "Scala Improvement Process" (SIP) documents.
66

7+
## Dependencies ##
8+
9+
This site uses a Jekyll, a Ruby framework. You'll need Ruby and Bundler installed; see [Jekyll installation instructions](https://jekyllrb.com/docs/installation/) for the details.
10+
711
## Quickstart ##
812

913
To build and view the site locally:
1014

11-
gem install --user-install bundler jekyll
15+
bundle install
1216
bundle exec jekyll serve -I
1317

1418
([Trouble on MacOS?](https://github.com/scala/docs.scala-lang/issues/1150))
@@ -53,10 +57,6 @@ Small changes, or corrected typos will generally be pulled in right away. Large
5357
existing documents will be thoroughly reviewed-- please keep in mind that, generally, new documents must be very well-polished, complete, and maintained
5458
in order to be accepted.
5559

56-
## Dependencies ##
57-
58-
This site uses a Jekyll, a Ruby framework. You'll need Ruby and Bundler installed; see [Jekyll installation instructions](https://jekyllrb.com/docs/installation/) for the details.
59-
6060
## Building & Viewing ##
6161

6262
cd into the directory where you cloned this repository, then install the required gems with `bundle install`. This will automatically put the gems into `./vendor/bundle`.

_overviews/scala3-migration/external-resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: External Resources
33
type: chapter
44
description: This section lists external resources about the migration to Scala 3.
5-
num: 28
5+
num: 29
66
previous-page: plugin-kind-projector
77
next-page:
88
---

_overviews/scala3-migration/incompat-contextual-abstractions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Contextual Abstractions
33
type: section
44
description: This chapter details all incompatibilities caused by the redesign of contextual abstractions
5-
num: 18
5+
num: 19
66
previous-page: incompat-dropped-features
77
next-page: incompat-other-changes
88
---

_overviews/scala3-migration/incompat-dropped-features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Dropped Features
33
type: section
44
description: This chapter details all the dropped features
5-
num: 17
5+
num: 18
66
previous-page: incompat-syntactic
77
next-page: incompat-contextual-abstractions
88
---

_overviews/scala3-migration/incompat-other-changes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Other Changed Features
33
type: section
44
description: This chapter details all incompatibilities caused by changed features
5-
num: 19
5+
num: 20
66
previous-page: incompat-contextual-abstractions
77
next-page: incompat-type-checker
88
---

_overviews/scala3-migration/incompat-syntactic.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Syntactic Changes
33
type: section
44
description: This chapter details all the incompatibilities caused by syntactic changes
5-
num: 16
5+
num: 17
66
previous-page: incompatibility-table
77
next-page: incompat-dropped-features
88
---

_overviews/scala3-migration/incompat-type-checker.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Type Checker
33
type: section
44
description: This chapter details the unsoundness fixes in the type checker
5-
num: 20
5+
num: 21
66
previous-page: incompat-other-changes
77
next-page: incompat-type-inference
88
---

_overviews/scala3-migration/incompat-type-inference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Type Inference
33
type: section
44
description: This chapter details the incompatibilities caused by the new type inference algorithm
5-
num: 21
5+
num: 22
66
previous-page: incompat-type-checker
77
next-page: options-intro
88
---

_overviews/scala3-migration/incompatibility-table.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Incompatibility Table
33
type: chapter
44
description: This chapter list all the known incompatibilities between Scala 2.13 and Scala 3
5-
num: 15
5+
num: 16
66
previous-page: tooling-syntax-rewriting
77
next-page: incompat-syntactic
88
---

_overviews/scala3-migration/options-intro.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Compiler Options
33
type: chapter
44
description: This chapter shows the difference between Scala 2.13 and Scala 3 compiler options
5-
num: 22
5+
num: 23
66
previous-page: incompat-type-inference
77
next-page: options-lookup
88
---

0 commit comments

Comments
 (0)