Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit f1da99c

Browse files
Merge pull request #366 from SethTisue/scala-3.0.0-RC2
Scala 3.0.0-RC2, sbt 1.5
2 parents 1caf77a + 3c31b61 commit f1da99c

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import: scala/scala-dev:travis/default.yml
55
language: scala
66

77
scala:
8+
- 3.0.0-RC2
89
- 3.0.0-RC1
910
- 2.11.12
1011
- 2.12.13

‎build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
2121
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
2222
// so we can `@nowarn` in test code, but only in test code, so the dependency
2323
// doesn't leak downstream
24-
libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2" % Test,
24+
libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.3" % Test,
2525

2626
apiMappings ++= scalaInstance.value.libraryJars.collect {
2727
case file if file.getName.startsWith("scala-library") && file.getName.endsWith(".jar") =>
@@ -47,10 +47,10 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
4747
)
4848
case _ => Seq()
4949
}),
50-
Compile / doc / scalacOptions ++= {
51-
if (isDotty.value)
50+
Compile / doc / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match{
51+
caseSome((3, _)) =>
5252
Seq() // TODO see what flags might be desirable to pass to Scala 3's Scaladoc
53-
else
53+
case _ =>
5454
Seq(
5555
"-diagrams",
5656
"-doc-source-url",
@@ -62,7 +62,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
6262
"-doc-version",
6363
version.value
6464
)
65-
},
65+
}),
6666
Compile / unmanagedSourceDirectories ++= {
6767
(Compile / unmanagedSourceDirectories).value.map { dir =>
6868
CrossVersion.partialVersion(scalaVersion.value) match {

‎project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.4.9
1+
sbt.version=1.5.0-RC2

‎project/plugins.sbt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
1111

1212
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0")
1313
addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion)
14-
1514
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "1.0.0-RC5")
16-
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.3")

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /