Skip to content

Commit a98084d

Browse files
committed
merge scala-master
2 parents b315e38 + e45cd10 commit a98084d

File tree

1,555 files changed

+75055
-44983
lines changed

Some content is hidden

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

1,555 files changed

+75055
-44983
lines changed

.drone.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
pipeline:
22
build:
3-
image: scalaplatform/jdk8-ruby2-coursier:0.1
3+
image: scalacenter/scala-rvm-jvm-coursier:2.0
44
pull: true
55
commands:
6-
- bundle install
7-
- ./scripts/run-tut.sh
8-
- rm -r tut-tmp
9-
- bundle exec jekyll build
6+
- ./scripts/ci.sh

.drone.yml.sig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgYnVpbGQ6CiAgICBpbWFnZTogc2NhbGFwbGF0Zm9ybS9qZGs4LXJ1YnkyLWNvdXJzaWVyOjAuMQogICAgcHVsbDogdHJ1ZQogICAgY29tbWFuZHM6CiAgICAgIC0gYnVuZGxlIGluc3RhbGwKICAgICAgLSAuL3NjcmlwdHMvcnVuLXR1dC5zaAogICAgICAtIHJtIC1yIHR1dC10bXAKICAgICAgLSBidW5kbGUgZXhlYyBqZWt5bGwgYnVpbGQK.uCV-tIDp9xbL2u2y27B9id6SL89dBfiiiTvVXYxHAbw
1+
eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgYnVpbGQ6CiAgICBpbWFnZTogamRrLXJ2bS1jb3Vyc2llcjpsYXRlc3QKICAgIHB1bGw6IHRydWUKICAgIGNvbW1hbmRzOgogICAgICAtIHNvdXJjZSB-Ly5wcm9maWxlCiAgICAgIC0gYnVuZGxlIGluc3RhbGwKICAgICAgLSAuL3NjcmlwdHMvcnVuLXR1dC5zaAogICAgICAtIHJtIC1yIHR1dC10bXAKICAgICAgLSBidW5kbGUgZXhlYyBqZWt5bGwgYnVpbGQK.7Rp37FEwRqAo85EdFYZh1PoyU8mxpFdEnpchWaQkHCc

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
_site
2+
.ruby-version
23
.DS_Store
34
.project
45
.settings
@@ -8,3 +9,4 @@ vendor/bundle
89
.idea/
910
/coursier
1011
/tut-tmp/
12+
.sass-cache/

CNAME

Lines changed: 0 additions & 1 deletion
This file was deleted.

CODE_OF_CONDUCT.md

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
## Scala Code of Conduct
2+
3+
We are committed to providing a friendly, safe and welcoming environment for
4+
all, regardless of level of experience, gender, gender identity and expression,
5+
sexual orientation, disability, personal appearance, body size, race, ethnicity,
6+
age, religion, nationality, or other such characteristics.
7+
8+
### Our Standards
9+
10+
**Whether you’re a regular contributor or a newcomer, we care about making this community a welcoming and safe place for you and we’ve got your back.**
11+
12+
As a member of the community, you agree to the following:
13+
14+
**Encouraged:**
15+
16+
- Be kind and courteous.
17+
- Respect differences of opinion and remember that every design or implementation choice carries a trade-off and numerous costs. There is seldom a single right answer.
18+
- Remember that everyone was new to Scala at some point. We want to encourage newcomers to join our community and learn the Scala language and ecosystem. Assume competence.
19+
- Show empathy towards other community members.
20+
21+
**Discouraged:**
22+
23+
- Keep unstructured critique to a minimum. We encourage sharing ideas and perspectives, so please ensure that your feedback is constructive and relevant. If you have solid ideas you want to experiment with, make a fork and see how it works.
24+
- Avoid aggressive and micro-aggressive behavior, such as unconstructive criticism, providing corrections that do not improve the conversation (sometimes referred to as "well actually"s), repeatedly interrupting or talking over someone else, feigning surprise at someone’s lack of knowledge or awareness about a topic, or subtle prejudice (for example, comments like “That’s so easy my grandmother could do it.”). For more examples of this kind of behavior, [see the Recurse Center's user manual](https://www.recurse.com/manual#sec-environment).
25+
- We will exclude you from interaction if you insult, demean or harass anyone. The term “Harassment” includes “Unacceptable Behavior” described in the [Citizen Code of Conduct](http://citizencodeofconduct.org/). **In particular, we don’t tolerate behavior that excludes people in socially marginalized groups.**
26+
- Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member's behavior, please contact one of the [moderators](https://contributors.scala-lang.org/about) or any member of the [Scala Center](http://scala.epfl.ch/) immediately.
27+
- Likewise any spamming, trolling, flaming, baiting or other attention-stealing behaviour is not welcome.
28+
29+
### Moderation
30+
31+
These are the policies for upholding our community’s standards of conduct. If
32+
you feel that a thread needs moderation, please contact anyone on the
33+
[moderation team](https://contributors.scala-lang.org/about), or any employee of
34+
the [Scala Center](https://scala.epfl.ch/).
35+
36+
- Remarks that violate the above code of conduct, including hateful, hurtful, oppressive, or exclusionary remarks, are not allowed. (Cursing is allowed, but never targeting another user, and never in a hateful manner.)
37+
- Moderators will warn users who make remarks inconsistent with the above code of conduct.
38+
- If the warning is unheeded, the user will be “kicked,” i.e., kicked out of the communication channel to cool off.
39+
- If the user comes back and continues to make trouble, they will be banned, i.e., indefinitely excluded.
40+
- Moderators may choose at their discretion to un-ban the user if it was a first offense and they if they make suitable amends with the offended party.
41+
- If you think a ban is unjustified, please take it up with that moderator, or with a different moderator, in private. Complaints about bans in-channel are not allowed.
42+
- Moderators are held to a higher standard than other community members. If a moderator acts inappropriately, they should expect less leeway than others.
43+
44+
In the Scala community we strive to go the extra step to look out for each
45+
other. Don’t just aim to be technically unimpeachable; try to be your best self.
46+
In particular, avoid exacerbating offensive or sensitive issues, particularly if
47+
they’re off-topic; this all too often leads to unnecessary fights, hurt
48+
feelings, and damaged trust; worse, it can drive people away from the community
49+
entirely.
50+
51+
If someone takes issue with something you said or did, resist the urge to be
52+
defensive. Rather, stop the offending behavior, apologize, and be sensitive
53+
thereafter. Even if you feel you were misinterpreted or unfairly accused,
54+
chances are good there was something you could’ve communicated better — remember
55+
that it’s your responsibility to make your fellow Scala developers comfortable.
56+
We are all here first and foremost because we want to talk about cool
57+
technology, and everyone wants to get along in doing so. People are generally
58+
eager to assume good intent and forgive.
59+
60+
### Domain
61+
62+
The enforcement policies listed above apply to all official Scala channels:
63+
mailing lists, GitHub repositories and Gitter channels under scala and
64+
scalacenter, Discourse, and Scala Center venues and hackathons. For other
65+
projects adopting the Scala Code of Conduct, please contact the maintainers of
66+
those projects for enforcement. If you wish to use this code of conduct for your
67+
own project, consider explicitly mentioning your moderation policy or making a
68+
copy with your own moderation policy so as to avoid confusion.
69+
70+
### Credits
71+
72+
Adapted from and/or inspired by multiple successful Codes of Conduct, including:
73+
74+
* [Rust Code of Conduct](https://www.rust-lang.org/en-US/conduct.html)
75+
* [The Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling)
76+
* [The Contributor Covenant v1.4.0](http://contributor-covenant.org/version/1/4/)
77+
* [The Recurse Center's User Manual](https://www.recurse.com/manual#sec-environment)
78+
* [The 18F Code of Conduct](https://18f.gsa.gov/code-of-conduct/)

Gemfile

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,12 @@
11
source 'https://rubygems.org'
2-
gem 'github-pages', group: :jekyll_plugins
2+
gem 'jekyll-redirect-from'
3+
# gem 'html-proofer' # link-checking: bundle exec htmlproofer ./_site/ --only-4xx --empty-alt-ignore --allow-hash-href
4+
5+
# group :jekyll_plugins do
6+
# gem 'hawkins'
7+
# end
8+
9+
# ^ Useful for live reloading the site in your
10+
# browser during development. To use, uncomment
11+
# and do:
12+
# bundle exec jekyll liveserve --incremental

Gemfile.lock

Lines changed: 24 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,145 +1,53 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.2.7)
5-
i18n (~> 0.7)
6-
json (~> 1.7, >= 1.7.7)
7-
minitest (~> 5.1)
8-
thread_safe (~> 0.3, >= 0.3.4)
9-
tzinfo (~> 1.1)
10-
addressable (2.4.0)
11-
coffee-script (2.4.1)
12-
coffee-script-source
13-
execjs
14-
coffee-script-source (1.10.0)
4+
addressable (2.5.1)
5+
public_suffix (~> 2.0, >= 2.0.2)
156
colorator (1.1.0)
16-
ethon (0.9.1)
17-
ffi (>= 1.3.0)
18-
execjs (2.7.0)
19-
faraday (0.9.2)
20-
multipart-post (>= 1.2, < 3)
21-
ffi (1.9.14)
7+
ffi (1.9.18)
228
forwardable-extended (2.6.0)
23-
gemoji (2.1.0)
24-
github-pages (104)
25-
activesupport (= 4.2.7)
26-
github-pages-health-check (= 1.2.0)
27-
jekyll (= 3.3.0)
28-
jekyll-avatar (= 0.4.2)
29-
jekyll-coffeescript (= 1.0.1)
30-
jekyll-feed (= 0.8.0)
31-
jekyll-gist (= 1.4.0)
32-
jekyll-github-metadata (= 2.2.0)
33-
jekyll-mentions (= 1.2.0)
34-
jekyll-paginate (= 1.1.0)
35-
jekyll-redirect-from (= 0.11.0)
36-
jekyll-sass-converter (= 1.3.0)
37-
jekyll-seo-tag (= 2.1.0)
38-
jekyll-sitemap (= 0.12.0)
39-
jekyll-swiss (= 0.4.0)
40-
jemoji (= 0.7.0)
41-
kramdown (= 1.11.1)
42-
liquid (= 3.0.6)
43-
listen (= 3.0.6)
44-
mercenary (~> 0.3)
45-
minima (= 2.0.0)
46-
rouge (= 1.11.1)
47-
terminal-table (~> 1.4)
48-
github-pages-health-check (1.2.0)
49-
addressable (~> 2.3)
50-
net-dns (~> 0.8)
51-
octokit (~> 4.0)
52-
public_suffix (~> 1.4)
53-
typhoeus (~> 0.7)
54-
html-pipeline (2.4.2)
55-
activesupport (>= 2)
56-
nokogiri (>= 1.4)
57-
i18n (0.7.0)
58-
jekyll (3.3.0)
9+
jekyll (3.5.1)
5910
addressable (~> 2.4)
6011
colorator (~> 1.0)
6112
jekyll-sass-converter (~> 1.0)
6213
jekyll-watch (~> 1.1)
6314
kramdown (~> 1.3)
64-
liquid (~> 3.0)
15+
liquid (~> 4.0)
6516
mercenary (~> 0.3.3)
6617
pathutil (~> 0.9)
6718
rouge (~> 1.7)
6819
safe_yaml (~> 1.0)
69-
jekyll-avatar (0.4.2)
70-
jekyll (~> 3.0)
71-
jekyll-coffeescript (1.0.1)
72-
coffee-script (~> 2.2)
73-
jekyll-feed (0.8.0)
20+
jekyll-redirect-from (0.12.1)
7421
jekyll (~> 3.3)
75-
jekyll-gist (1.4.0)
76-
octokit (~> 4.2)
77-
jekyll-github-metadata (2.2.0)
78-
jekyll (~> 3.1)
79-
octokit (~> 4.0, != 4.4.0)
80-
jekyll-mentions (1.2.0)
81-
activesupport (~> 4.0)
82-
html-pipeline (~> 2.3)
83-
jekyll (~> 3.0)
84-
jekyll-paginate (1.1.0)
85-
jekyll-redirect-from (0.11.0)
86-
jekyll (>= 2.0)
87-
jekyll-sass-converter (1.3.0)
88-
sass (~> 3.2)
89-
jekyll-seo-tag (2.1.0)
90-
jekyll (~> 3.3)
91-
jekyll-sitemap (0.12.0)
92-
jekyll (~> 3.3)
93-
jekyll-swiss (0.4.0)
22+
jekyll-sass-converter (1.5.0)
23+
sass (~> 3.4)
9424
jekyll-watch (1.5.0)
9525
listen (~> 3.0, < 3.1)
96-
jemoji (0.7.0)
97-
activesupport (~> 4.0)
98-
gemoji (~> 2.0)
99-
html-pipeline (~> 2.2)
100-
jekyll (>= 3.0)
101-
json (1.8.3)
102-
kramdown (1.11.1)
103-
liquid (3.0.6)
104-
listen (3.0.6)
105-
rb-fsevent (>= 0.9.3)
106-
rb-inotify (>= 0.9.7)
26+
kramdown (1.14.0)
27+
liquid (4.0.0)
28+
listen (3.0.8)
29+
rb-fsevent (~> 0.9, >= 0.9.4)
30+
rb-inotify (~> 0.9, >= 0.9.7)
10731
mercenary (0.3.6)
108-
mini_portile2 (2.1.0)
109-
minima (2.0.0)
110-
minitest (5.9.1)
111-
multipart-post (2.0.0)
112-
net-dns (0.8.0)
113-
nokogiri (1.6.8.1)
114-
mini_portile2 (~> 2.1.0)
115-
octokit (4.4.1)
116-
sawyer (~> 0.7.0, >= 0.5.3)
11732
pathutil (0.14.0)
11833
forwardable-extended (~> 2.6)
119-
public_suffix (1.5.3)
120-
rb-fsevent (0.9.8)
121-
rb-inotify (0.9.7)
122-
ffi (>= 0.5.0)
34+
public_suffix (2.0.5)
35+
rb-fsevent (0.10.2)
36+
rb-inotify (0.9.10)
37+
ffi (>= 0.5.0, < 2)
12338
rouge (1.11.1)
12439
safe_yaml (1.0.4)
125-
sass (3.4.22)
126-
sawyer (0.7.0)
127-
addressable (>= 2.3.5, < 2.5)
128-
faraday (~> 0.8, < 0.10)
129-
terminal-table (1.7.3)
130-
unicode-display_width (~> 1.1.1)
131-
thread_safe (0.3.5)
132-
typhoeus (0.8.0)
133-
ethon (>= 0.8.0)
134-
tzinfo (1.2.2)
135-
thread_safe (~> 0.1)
136-
unicode-display_width (1.1.1)
40+
sass (3.5.1)
41+
sass-listen (~> 4.0.0)
42+
sass-listen (4.0.0)
43+
rb-fsevent (~> 0.9, >= 0.9.4)
44+
rb-inotify (~> 0.9, >= 0.9.7)
13745

13846
PLATFORMS
13947
ruby
14048

14149
DEPENDENCIES
142-
github-pages
50+
jekyll-redirect-from
14351

14452
BUNDLED WITH
145-
1.13.6
53+
1.15.4

README.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
11
# Scala Documentation #
2-
[![Build Status](https://platform-ci.scala-lang.org/api/badges/scala/scala.github.com/status.svg)](https://platform-ci.scala-lang.org/scala/scala.github.com)
2+
3+
[![Build Status](https://platform-ci.scala-lang.org/api/badges/scala/docs.scala-lang/status.svg)](https://platform-ci.scala-lang.org/scala/docs.scala-lang)
34

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

7+
## Quickstart ##
8+
9+
To build and view the site locally:
10+
11+
gem install bundler
12+
bundle install
13+
bundle exec jekyll serve -I
14+
15+
For more details, read on.
16+
617
## Contributing ##
718

819
Please have a look at [http://docs.scala-lang.org/contribute.html](http://docs.scala-lang.org/contribute.html) before making a contribution.

0 commit comments

Comments
 (0)