Skip to content
New issue

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

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

Already on GitHub? # to your account

drop support for Scala.js 0.6.x #713

Merged
merged 1 commit into from
Nov 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 0 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,16 @@ jobs:
java: adopt@1.8
scala: 0.27.0-RC1
platform: js
pluginversion: 1.3.0
- workers: 1
os: ubuntu-latest
java: adopt@1.8
scala: 2.12.10
platform: js
pluginversion: 1.3.0
- workers: 1
os: ubuntu-latest
java: adopt@1.8
scala: 2.13.3
platform: js
pluginversion: 1.3.0
- workers: 1
os: ubuntu-latest
java: adopt@1.8
scala: 2.11.12
platform: js
pluginversion: 0.6.33
- workers: 1
os: ubuntu-latest
java: adopt@1.8
Expand Down
6 changes: 0 additions & 6 deletions CONTRIBUTING.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@ use the `jvm` project:

> jvm/console

By default, the Scala.js version is usually the latest 1.0 release.
If you want to override the version, you can use the `SCALAJS_VERSION`
environment variable.

$ env SCALAJS_VERSION=0.6.33 sbt

The releases are done with the `release.sh` script. If you change the
script, you can test it still works, but not publish artifacts, by
running a non-publishing command like `package`:
Expand Down
10 changes: 1 addition & 9 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,9 @@ ThisBuild / githubWorkflowBuildMatrixInclusions ++=
crossScalaVersions.value.filterNot(Set(Scala211, DottyNew)) map { scala =>
MatrixInclude(
Map("os" -> PrimaryOS, "java" -> Java8, "scala" -> scala),
Map("platform" -> "js", "pluginversion" -> "1.3.0", "workers" -> "1"))
Map("platform" -> "js", "workers" -> "1"))
}

ThisBuild / githubWorkflowBuildMatrixInclusions +=
MatrixInclude(
Map("os" -> PrimaryOS, "java" -> Java8, "scala" -> Scala211),
Map("platform" -> "js", "pluginversion" -> "0.6.33", "workers" -> "1"))

ThisBuild / githubWorkflowBuildMatrixInclusions ++=
Seq("0.3.9", "0.4.0-M2") map { v =>
MatrixInclude(
Expand Down Expand Up @@ -107,9 +102,6 @@ lazy val scalaVersionSettings = Seq(
}
)

lazy val scalaJSVersion =
env("SCALAJS_VERSION").getOrElse("1.3.0")

lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq(

name := "scalacheck",
Expand Down
11 changes: 2 additions & 9 deletions project/plugin.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")

addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.4.5")

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

def env(name: String): Option[String] =
Option(System.getenv(name))

Expand All @@ -12,15 +14,6 @@ def printAndDie(msg: String): Nothing = {
sys.error(msg)
}

// Update SCALAJS_VERSION in release.sh, as well
val scalaJSVersion = env("SCALAJS_VERSION") match {
case Some("0.6.33") => "0.6.33"
case Some("1.3.0") | Some("") | None => "1.3.0"
case Some(v) => printAndDie(s"unsupported scala.js version: $v")
}

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

// Update SCALANATIVE_VERSION in release.sh, as well
val scalaNativeVersion = env("SCALANATIVE_VERSION") match {
case Some("0.3.9") | Some("") | None => "0.3.9"
Expand Down
6 changes: 2 additions & 4 deletions release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,8 @@ runsbt "+ clean"
# step 4a: jvm release
runsbt "+ jvm/$CMD"

# step 4b: js releases (clean versions)
SCALAJS_VERSION="0.6.33" runsbt "+ js/$CMD"
runsbt "+ js/clean"
SCALAJS_VERSION="1.3.0" runsbt "+ js/$CMD"
# step 4b: js releases
runsbt "+ js/$CMD"

# step 4c: native releases (clean versions)
SCALANATIVE_VERSION="0.3.9" runsbt "+ native/$CMD"
Expand Down
6 changes: 1 addition & 5 deletions tools/travis-script.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
#!/bin/bash
set -evu

if [[ "$PLATFORM" == "js" ]]; then
export SCALAJS_VERSION="$PLUGIN_VERSION"
else
export SCALANATIVE_VERSION="$PLUGIN_VERSION"
fi
export SCALANATIVE_VERSION="$PLUGIN_VERSION"

sbt_cmd=(sbt ++$TRAVIS_SCALA_VERSION)

Expand Down