diff --git a/docs/.gitignore b/docs/.gitignore deleted file mode 100644 index 6f8e43ce5ec4..000000000000 --- a/docs/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -# Jekyll specific ignores -vendor/ -.bundle/ -Gemfile.lock -_site/ -.sass-cache/ diff --git a/docs/_includes/features.html b/docs/_includes/features.html deleted file mode 100644 index 0396d7278f0f..000000000000 --- a/docs/_includes/features.html +++ /dev/null @@ -1,123 +0,0 @@ -
-
-

So, features?

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Intersection TypesImplemented
Union TypesImplemented
Type lambdasImplemented
Context queryImplemented
Trait parametersImplemented
Implied InstancesImplemented
Inferable parametersImplemented
Extension MethodsImplemented
Opaque Type AliasesImplemented
Toplevel definitionsImplemented
Export clausesImplemented
Vararg patternsImplemented
Creator applicationsImplemented
@static methods and fieldsImplemented
SBT incremental buildImplemented
Option-less pattern matchingImplemented
Multiversal equalityImplemented
Erased TermsImplemented
Auto-SpecializationIn progress
Whole program optimizerIn progress
HList & HMaps/Record typesIn progress
EffectsConsidered
…and many more, check the overview page for a comprehensive list
-
-

Talks on Dotty?

- -

I have more questions!

-
-

That’s great! We have more details on the docs and please join our Gitter channel!

-
-
-
-
diff --git a/docs/_includes/getting-started.html b/docs/_includes/getting-started.html deleted file mode 100644 index c52c3e110203..000000000000 --- a/docs/_includes/getting-started.html +++ /dev/null @@ -1,28 +0,0 @@ -
-
- -

Try Dotty

-

If you are a Mac user, you can install Dotty with brew:

- 
brew install lampepfl/brew/dotty
- -

If you are a Linux or Windows user, download the latest release. Optionally add path of the folder bin/ to the system environment variable PATH.

- -

Now you can compile Scala source code:

- 
scalac hello.scala
- -

To start the REPL, run: scala.

- -

Or, you can try Dotty in your browser with Scastie.

- -

Create a Dotty Project

-

The fastest way to create a new project in Dotty is using sbt (1.1.4+).

- -

Create a Dotty project:

- 
sbt new scala/scala3.g8
- -

Or a Dotty project that cross compiles with Scala 2:

- 
sbt new scala/scala3-cross.g8
- -

For documentation see the Dotty Example Project.

-
-
diff --git a/docs/_includes/logo-page.html b/docs/_includes/logo-page.html deleted file mode 100644 index b580bea99843..000000000000 --- a/docs/_includes/logo-page.html +++ /dev/null @@ -1,43 +0,0 @@ -
-
- -
-
-
- logo -
-

Dotty

-

A next-generation compiler for Scala

-

(scroll down for more info)

-
-
-
-
diff --git a/docs/_includes/table-of-contents.html b/docs/_includes/table-of-contents.html deleted file mode 100644 index 4b2183bd3225..000000000000 --- a/docs/_includes/table-of-contents.html +++ /dev/null @@ -1,15 +0,0 @@ - diff --git a/scaladoc/scala3-docs/_layouts/base.html b/docs/_layouts/base.html similarity index 100% rename from scaladoc/scala3-docs/_layouts/base.html rename to docs/_layouts/base.html diff --git a/scaladoc/scala3-docs/_layouts/blog-page.html b/docs/_layouts/blog-page.html similarity index 100% rename from scaladoc/scala3-docs/_layouts/blog-page.html rename to docs/_layouts/blog-page.html diff --git a/scaladoc/scala3-docs/_layouts/doc-page.html b/docs/_layouts/doc-page.html similarity index 100% rename from scaladoc/scala3-docs/_layouts/doc-page.html rename to docs/_layouts/doc-page.html diff --git a/scaladoc/scala3-docs/_layouts/index.html b/docs/_layouts/index.html similarity index 100% rename from scaladoc/scala3-docs/_layouts/index.html rename to docs/_layouts/index.html diff --git a/scaladoc/scala3-docs/_layouts/main.html b/docs/_layouts/main.html similarity index 100% rename from scaladoc/scala3-docs/_layouts/main.html rename to docs/_layouts/main.html diff --git a/scaladoc/scala3-docs/_layouts/search.html b/docs/_layouts/search.html similarity index 100% rename from scaladoc/scala3-docs/_layouts/search.html rename to docs/_layouts/search.html diff --git a/scaladoc/scala3-docs/css/bootstrap.min.css b/docs/css/bootstrap.min.css similarity index 100% rename from scaladoc/scala3-docs/css/bootstrap.min.css rename to docs/css/bootstrap.min.css diff --git a/scaladoc/scala3-docs/css/color-brewer.css b/docs/css/color-brewer.css similarity index 100% rename from scaladoc/scala3-docs/css/color-brewer.css rename to docs/css/color-brewer.css diff --git a/scaladoc/scala3-docs/css/dottydoc.css b/docs/css/dottydoc.css similarity index 100% rename from scaladoc/scala3-docs/css/dottydoc.css rename to docs/css/dottydoc.css diff --git a/docs/css/frontpage.css b/docs/css/frontpage.css index ae9107f9a5c0..722d4ba09802 100644 --- a/docs/css/frontpage.css +++ b/docs/css/frontpage.css @@ -1,5 +1,5 @@ @import url('https://fonts.googleapis.com/css?family=Lobster&display=swap'); - + body { height: 100%; width: 100%; @@ -60,6 +60,12 @@ section.page { min-height: 100vh; width: 100%; padding: 0; + padding-bottom: 2em; +} + +section.page strong { + font-weight: bold; + color: rgba(255,255,255,0.6); } section .container { diff --git a/scaladoc/scala3-docs/css/search.css b/docs/css/search.css similarity index 100% rename from scaladoc/scala3-docs/css/search.css rename to docs/css/search.css diff --git a/scaladoc/scala3-docs/css/sidebar.css b/docs/css/sidebar.css similarity index 100% rename from scaladoc/scala3-docs/css/sidebar.css rename to docs/css/sidebar.css diff --git a/scaladoc/scala3-docs/css/toolbar.css b/docs/css/toolbar.css similarity index 100% rename from scaladoc/scala3-docs/css/toolbar.css rename to docs/css/toolbar.css diff --git a/docs/index.html b/docs/index.html index ce55dbe02167..a6e99cb73265 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1,8 +1,104 @@ --- -title: Dotty -layout: base +title: Scala 3 +layout: main +hasFrame: false extraCSS: - css/frontpage.css --- -{% include logo-page.html %} -{% include getting-started.html %} + +
+
+ +
+
+
+ logo +
+

Scala 3

+

A next-generation compiler for Scala

+

(scroll down for more info)

+
+
+
+
+
+
+ +

Try Scala 3

+

There are multiple ways of getting started with Scala 3.

+
    +
  1. You can try Scala 3 in your browser with Scastie.
    2. +
  2. If you already have sbt installed, you can create a Scala 3 project and sbt will take care of the rest.
    3. +
  3. You can install all necessary dependencies with coursier by running cs setup. You can also run cs install scala3-compiler or cs install scala3-repl to install command-line commands for the compiler and repl, correspondingly.
    4. +
  4. You can manually install Scala 3 on your computer.
    5. +
+ +

Install Scala 3

+

If you are a Mac user, you can install Scala 3 with brew:

+ 
brew install lampepfl/brew/dotty
+ +

+ If you are a Linux or Windows user, as a prerequisite you need a JDK 8 or later properly installed on your system. The environment variable JAVA_HOME should point to your Java installation.
+ For Windows users, we recommend using the Windows subsystem for linux or some other bash shell like git bash.
+ Then download the latest release. Optionally add the path of the folder bin/ to the system environment variable PATH. +

+ +

Now you can compile Scala source code:

+ 
scalac hello.scala
+ +

To start the REPL, run: scala.

+ +

Create a Scala 3 Project

+

The fastest way to create a new project in Scala 3 is using sbt (1.1.4+).

+ +

Create a Scala 3 project:

+ 
sbt new lampepfl/dotty.g8
+ +

Or a Scala 3 project that cross compiles with Scala 2:

+ 
sbt new lampepfl/dotty-cross.g8
+ +

For documentation see the Scala 3 Example Project.

+ +

Learn more about Scala 3

+

You can find much more information about Scala 3 in ...

+ +
+
diff --git a/scaladoc/scala3-docs/js/api-search.js b/docs/js/api-search.js similarity index 100% rename from scaladoc/scala3-docs/js/api-search.js rename to docs/js/api-search.js diff --git a/scaladoc/scala3-docs/js/bootstrap.min.js b/docs/js/bootstrap.min.js similarity index 100% rename from scaladoc/scala3-docs/js/bootstrap.min.js rename to docs/js/bootstrap.min.js diff --git a/scaladoc/scala3-docs/js/highlight.pack.js b/docs/js/highlight.pack.js similarity index 100% rename from scaladoc/scala3-docs/js/highlight.pack.js rename to docs/js/highlight.pack.js diff --git a/scaladoc/scala3-docs/js/jquery.min.js b/docs/js/jquery.min.js similarity index 100% rename from scaladoc/scala3-docs/js/jquery.min.js rename to docs/js/jquery.min.js diff --git a/scaladoc/scala3-docs/js/sidebar.js b/docs/js/sidebar.js similarity index 100% rename from scaladoc/scala3-docs/js/sidebar.js rename to docs/js/sidebar.js diff --git a/scaladoc/scala3-docs/js/toolbar.js b/docs/js/toolbar.js similarity index 100% rename from scaladoc/scala3-docs/js/toolbar.js rename to docs/js/toolbar.js diff --git a/scaladoc/scala3-docs/logo.svg b/docs/logo.svg similarity index 100% rename from scaladoc/scala3-docs/logo.svg rename to docs/logo.svg diff --git a/project/Build.scala b/project/Build.scala index f015bd7760f5..41bb738ed73c 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1622,7 +1622,7 @@ object Build { "-skip-by-id:scala.runtime.MatchCase " + "-skip-by-regex:.+\\.internal($|\\..+) " + "-skip-by-regex:.+\\.impl($|\\..+) " + - "-comment-syntax wiki -siteroot scaladoc/scala3-docs -project-logo scaladoc/scala3-docs/logo.svg " + + "-comment-syntax wiki -siteroot docs -project-logo docs/logo.svg " + "-external-mappings:.*java.*::javadoc::https://docs.oracle.com/javase/8/docs/api/ " + s"-source-links:$stdLibRoot=github://scala/scala/v${stdlibVersion(Bootstrapped)}#src/library " + s"-doc-root-content $docRootFile" diff --git a/scaladoc/scala3-docs/blog b/scaladoc/scala3-docs/blog deleted file mode 120000 index b4f84f8e60f7..000000000000 --- a/scaladoc/scala3-docs/blog +++ /dev/null @@ -1 +0,0 @@ -../../docs/blog/ \ No newline at end of file diff --git a/scaladoc/scala3-docs/css/frontpage.css b/scaladoc/scala3-docs/css/frontpage.css deleted file mode 100644 index 722d4ba09802..000000000000 --- a/scaladoc/scala3-docs/css/frontpage.css +++ /dev/null @@ -1,175 +0,0 @@ - @import url('https://fonts.googleapis.com/css?family=Lobster&display=swap'); - -body { - height: 100%; - width: 100%; - margin: 0; - padding: 0; - font-family: var(--font-family-sans-serif); - font-weight: 300; - scroll-behavior: smooth; -} - -h1, h2, h3 { - font-family: "Lobster", serif; - font-weight: 500; - text-align: center; - padding-top: 20px; -} - -h1 { - font-size: 64px; -} - -h1#main { - font-size: 15vh; -} - -/* navigation */ -header { - font-size: 24px; -} - -header .nav-item i { - font-size: 1.5em; -} - -.navbar-dark .navbar-nav .nav-link, .navbar-dark .navbar-toggler { - color: white; -} - -.navbar-dark .navbar-toggler { - border: none; - padding: 0; - font-size: 1.5em; -} - -.navbar #navbarContent { - /* above the logo when opened on small screens */ - background: #ca445e; - z-index: 100; - box-shadow: 0px 10px 40px #ca445e; -} - -.nav-item { - margin-left: .5em; -} - -/* layout */ -section.page { - min-height: 100vh; - width: 100%; - padding: 0; - padding-bottom: 2em; -} - -section.page strong { - font-weight: bold; - color: rgba(255,255,255,0.6); -} - -section .container { - max-width: 750px; -} - -section p { - margin-bottom: 0px; - padding-bottom: 15px; - line-height: 3vh; -} - -section p ~ pre { - margin-top: -8px; - margin-bottom: 25px; -} - -.centered-table table { - width: 100%; - margin-left: auto; - margin-right: auto; -} - -/* background colors */ -.bg-red { - background-color: #ca445e; -} -.bg-blue { - background-color: #002B36; -} -.bg-teal { - background-color: #224951; -} - -/* text colors */ -.bg-dark { - color: white; -} -.bg-dark a { - color: #f26527; -} -.bg-dark a:hover { - color: #da4323; -} - -/* code */ -pre, code { - background-color: #efefef; - border-radius: 4px; - padding: 3px 8px; - line-height: 1.75em; -} - -/* gitter chat */ -.gitter-chat-embed { - top: 0; - bottom: 0; -} - -aside { - margin: 0; - padding: 0; -} - -/* logo animation */ -@keyframes fadeInLogo { - from { - transform: translateY(0) scale(0.8); - opacity: 0; - } - - to { - transform: translateY(0) scale(1); - opacity: 1; - } -} - -.scala-logo-container { - height: calc(100vh - 80px); - margin: auto; - position: absolute; - top: 80px; - right: 0; - bottom: 0; - left: 0; - animation: 2s fadeInLogo; - animation-timing-function: cubic-bezier(0.6, 0.2, 0.1, 1) 0.1s; -} - -.scala-logo-container img { - height: 60%; - display: block; - width: 100%; -} - -.scala-logo-container .subtitle { - bottom: 0; - position: absolute; - width: 100%; - font-size: 1.5em; - line-height: 3vh; -} - -.scala-logo-container .subtitle h1 { - font-size: 100px; - font-size: 15vh; -} diff --git a/scaladoc/scala3-docs/docs b/scaladoc/scala3-docs/docs deleted file mode 120000 index 4fb178c6ece2..000000000000 --- a/scaladoc/scala3-docs/docs +++ /dev/null @@ -1 +0,0 @@ -../../docs/docs \ No newline at end of file diff --git a/scaladoc/scala3-docs/images b/scaladoc/scala3-docs/images deleted file mode 120000 index 4c0d78a4008b..000000000000 --- a/scaladoc/scala3-docs/images +++ /dev/null @@ -1 +0,0 @@ -../../docs/images \ No newline at end of file diff --git a/scaladoc/scala3-docs/index.html b/scaladoc/scala3-docs/index.html deleted file mode 100644 index a6e99cb73265..000000000000 --- a/scaladoc/scala3-docs/index.html +++ /dev/null @@ -1,104 +0,0 @@ ---- -title: Scala 3 -layout: main -hasFrame: false -extraCSS: - - css/frontpage.css ---- - -
-
- -
-
-
- logo -
-

Scala 3

-

A next-generation compiler for Scala

-

(scroll down for more info)

-
-
-
-
-
-
- -

Try Scala 3

-

There are multiple ways of getting started with Scala 3.

-
    -
  1. You can try Scala 3 in your browser with Scastie.
    2. -
  2. If you already have sbt installed, you can create a Scala 3 project and sbt will take care of the rest.
    3. -
  3. You can install all necessary dependencies with coursier by running cs setup. You can also run cs install scala3-compiler or cs install scala3-repl to install command-line commands for the compiler and repl, correspondingly.
    4. -
  4. You can manually install Scala 3 on your computer.
    5. -
- -

Install Scala 3

-

If you are a Mac user, you can install Scala 3 with brew:

- 
brew install lampepfl/brew/dotty
- -

- If you are a Linux or Windows user, as a prerequisite you need a JDK 8 or later properly installed on your system. The environment variable JAVA_HOME should point to your Java installation.
- For Windows users, we recommend using the Windows subsystem for linux or some other bash shell like git bash.
- Then download the latest release. Optionally add the path of the folder bin/ to the system environment variable PATH. -

- -

Now you can compile Scala source code:

- 
scalac hello.scala
- -

To start the REPL, run: scala.

- -

Create a Scala 3 Project

-

The fastest way to create a new project in Scala 3 is using sbt (1.1.4+).

- -

Create a Scala 3 project:

- 
sbt new lampepfl/dotty.g8
- -

Or a Scala 3 project that cross compiles with Scala 2:

- 
sbt new lampepfl/dotty-cross.g8
- -

For documentation see the Scala 3 Example Project.

- -

Learn more about Scala 3

-

You can find much more information about Scala 3 in ...

- -
-
diff --git a/scaladoc/scala3-docs/sidebar.yml b/scaladoc/scala3-docs/sidebar.yml deleted file mode 120000 index 8a524a9d97f1..000000000000 --- a/scaladoc/scala3-docs/sidebar.yml +++ /dev/null @@ -1 +0,0 @@ -../../docs/sidebar.yml \ No newline at end of file