Skip to content
This repository was archived by the owner on Sep 1, 2020. It is now read-only.

Commit e021346

Browse files
committed
Merge branch 'typelevel-readme' of github.com:typelevel/scala into typelevel-readme
2 parents 0334245 + fae5522 commit e021346

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ res6: Int = 23
125125
Requirements for using Typelevel Scala in your existing projects,
126126

127127
+ You must be using Lightbend Scala 2.11.11, 2.12.4 or 2.13.0-M2.
128-
+ You must be using SBT 0.13.13 or later.
128+
+ You must be using SBT 0.13.15 or later.
129129
+ Your build should use `scalaOrganization.value` and `CrossVersion.patch` appropriately.
130130

131131
You can find many examples linked to from [this issue][build-tweaks-1].

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ scalaVersion := "2.11.8"
77
micrositeName := "Typelevel"
88
micrositeDescription := "Our fork of the Scala compiler"
99
micrositeAuthor := "Typelevel contributors"
10-
micrositeHomepage := "http://typelevel.org/scala"
10+
micrositeHomepage := "http://typelevel.org/scala/"
1111
micrositeGithubOwner := "typelevel"
1212
micrositeGithubRepo := "scala"
1313
micrositeBaseUrl := "scala"
14-
micrositeDocumentationUrl := "docs"
14+
micrositeDocumentationUrl := "docs/"
1515
micrositeExtraMdFiles := Map(
1616
file("README.md") -> ExtraMdFileConfig(
1717
"index.md",

notes/typelevel-4.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ More details on the [PR][pr-trailing-commas].
296296
Requirements for using Typelevel Scala in your existing projects,
297297

298298
+ You must be using Lightbend Scala 2.11.11, 2.12.3 or 2.13.0-M2.
299-
+ You must be using SBT 0.13.13 or later.
299+
+ You must be using SBT 0.13.15 or later.
300300
+ Your build should use `scalaOrganization.value` and `CrossVersion.patch` appropriately.
301301

302302
You can find many examples linked to from [this issue][build-tweaks-1].

0 commit comments

Comments
 (0)