Skip to content
This repository was archived by the owner on Jul 30, 2024. It is now read-only.

Drop Scala.js 0.6 #305

Merged
merged 1 commit into from
Jul 31, 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
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ env:
- TRAVIS_NODE_VERSION="10.22.0"

script:
- SCALAJS_VERSION="0.6.33" sbt ++$TRAVIS_SCALA_VERSION test
- SCALAJS_VERSION="" sbt ++$TRAVIS_SCALA_VERSION test
- sbt ++$TRAVIS_SCALA_VERSION test

install:
- rm -rf ~/.nvm &&
Expand Down
3 changes: 0 additions & 3 deletions project/MySettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ object MySettings {
)

lazy val commonScalaJsSettings = Seq(
scalacOptions ++= Seq("-P:scalajs:sjsDefinedByDefault").filter { _ =>
Option(System.getenv("SCALAJS_VERSION")).exists(_.startsWith("0.6."))
},
scalaJSLinkerConfig ~= {
_.withModuleKind(ModuleKind.CommonJSModule)
},
Expand Down
5 changes: 1 addition & 4 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
val scalaJSVersion =
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.1.1")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.1.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.4")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
Expand Down
3 changes: 0 additions & 3 deletions script/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,4 @@

cat ./version.sbt

export SCALAJS_VERSION=0.6.33
sbt clean +publishSigned sonatypeBundleUpload sonatypeReleaseAll
unset SCALAJS_VERSION
sbt clean +publishSigned sonatypeBundleUpload sonatypeReleaseAll