Skip to content

Update scala 2.13.0-RC2 to 2.13.0-RC3 #213

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

Merged
merged 3 commits into from
May 29, 2019
Merged

Update scala 2.13.0-RC2 to 2.13.0-RC3 #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52de10a
Update to sbt-scalajs 0.6.28 and 1.0.0-M8
Philippus May 29, 2019
9d5163e
Update sbt-scala-native to 0.3.9
Philippus May 29, 2019
f4c2419
Update scala 2.13.0-RC2 to 2.13.0-RC3
Philippus May 29, 2019
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 @@ -7,7 +7,7 @@ jdk:
scala:
- 2.11.12
- 2.12.8
- 2.13.0-RC2
- 2.13.0-RC3

env:
global:
Expand All @@ -20,12 +20,12 @@ env:
matrix:
# The empty SCALAJS_VERSION will only compile for the JVM
- SCALAJS_VERSION=
- SCALAJS_VERSION=0.6.27
- SCALAJS_VERSION=1.0.0-M7
- SCALAJS_VERSION=0.6.28
- SCALAJS_VERSION=1.0.0-M8

matrix:
include:
- env: SCALANATIVE_VERSION=0.3.8
- env: SCALANATIVE_VERSION=0.3.9
jdk: oraclejdk8

script: admin/build.sh
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import ScalaModulePlugin._
import sbtcrossproject.crossProject

crossScalaVersions in ThisBuild := List("2.12.8", "2.11.12", "2.13.0-RC2")
crossScalaVersions in ThisBuild := List("2.12.8", "2.11.12", "2.13.0-RC3")

lazy val root = project.in(file("."))
.aggregate(`scala-parser-combinatorsJS`, `scala-parser-combinatorsJVM`, `scala-parser-combinatorsNative`)
Expand All @@ -14,7 +14,7 @@ lazy val `scala-parser-combinators` = crossProject(JSPlatform, JVMPlatform, Nati
settings(
name := "scala-parser-combinators",
version := "1.1.2-SNAPSHOT",
mimaPreviousVersion := Some("1.1.0").filter(_ => System.getenv("SCALAJS_VERSION") != "1.0.0-M7"),
mimaPreviousVersion := Some("1.1.0").filter(_ => System.getenv("SCALAJS_VERSION") != "1.0.0-M8"),

apiMappings += (scalaInstance.value.libraryJar ->
url(s"https://www.scala-lang.org/api/${scalaVersion.value}/")),
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0")

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

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

val scalaNativeVersion =
Option(System.getenv("SCALANATIVE_VERSION")).filter(_.nonEmpty).getOrElse("0.3.8")
Option(System.getenv("SCALANATIVE_VERSION")).filter(_.nonEmpty).getOrElse("0.3.9")

addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion)

Expand Down