Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Publish Scala 2.13.0 for 1.14.0 #481

Merged
merged 1 commit into from
Jun 10, 2019
Merged

Publish Scala 2.13.0 for 1.14.0 #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ scala:
- 2.10.7
- 2.11.12
- 2.12.6
- 2.13.0-RC2
- 2.13.0
jdk:
- oraclejdk8
env:
Expand All @@ -28,7 +28,7 @@ env:
- PLATFORM=jvm SBT_PARALLEL=true WORKERS=4 DEPLOY=false
- PLATFORM=jvm SBT_PARALLEL=false WORKERS=4 DEPLOY=false
- PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=true
- PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-M7
- PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-M8
sudo: false

matrix:
Expand All @@ -47,6 +47,6 @@ matrix:
- for d in */ ; do cd "$d" && sbt test:compile && cd ../ ; done
exclude:
- scala: 2.10.7
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-M7
- scala: 2.13.0-RC2
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=true SCALAJS_VERSION=1.0.0-M8
- scala: 2.13.0
env: PLATFORM=js SBT_PARALLEL=true WORKERS=1 DEPLOY=true
5 changes: 2 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ lazy val travisCommit = Option(System.getenv().get("TRAVIS_COMMIT"))

lazy val scalaVersionSettings = Seq(
scalaVersion := "2.12.6",
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.13.0-RC2", scalaVersion.value),
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.13.0", scalaVersion.value),
scalaMajorVersion := {
val v = scalaVersion.value
CrossVersion.partialVersion(v).map(_._2.toInt).getOrElse {
Expand Down Expand Up @@ -68,11 +68,10 @@ lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(
"-encoding", "UTF-8",
"-feature",
"-unchecked",
"-Xfuture",
"-Ywarn-dead-code",
"-Ywarn-numeric-widen") ++ {
val modern = Seq("-Xlint:-unused", "-Ywarn-unused:-patvars,-implicits,-locals,-privates,-explicits")
val removed = Seq("-Ywarn-inaccessible", "-Ywarn-nullary-override", "-Ywarn-nullary-unit")
val removed = Seq("-Ywarn-inaccessible", "-Ywarn-nullary-override", "-Ywarn-nullary-unit", "-Xfuture")
val removedModern = Seq("-Ywarn-infer-any", "-Ywarn-unused-import")
scalaMajorVersion.value match {
case 10 => Seq("-Xfatal-warnings", "-Xlint") ++ removed
Expand Down
2 changes: 1 addition & 1 deletion examples/scalajs/project/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.28")
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.2.3
sbt.version=1.2.8
2 changes: 1 addition & 1 deletion project/plugin.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.2.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")

val scalaJSVersion =
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.27")
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.28")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)

Expand Down