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

Commit 84b9611

Browse files
authored
Merge pull request #305 from exoego/drop-scalajs-0.6
Drop Scala.js 0.6
2 parents fbcbd21 + bd8d087 commit 84b9611

File tree

4 files changed

+2
-12
lines changed

4 files changed

+2
-12
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ env:
1515
- TRAVIS_NODE_VERSION="10.22.0"
1616

1717
script:
18-
- SCALAJS_VERSION="0.6.33" sbt ++$TRAVIS_SCALA_VERSION test
19-
- SCALAJS_VERSION="" sbt ++$TRAVIS_SCALA_VERSION test
18+
- sbt ++$TRAVIS_SCALA_VERSION test
2019

2120
install:
2221
- rm -rf ~/.nvm &&

project/MySettings.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ object MySettings {
5555
)
5656

5757
lazy val commonScalaJsSettings = Seq(
58-
scalacOptions ++= Seq("-P:scalajs:sjsDefinedByDefault").filter { _ =>
59-
Option(System.getenv("SCALAJS_VERSION")).exists(_.startsWith("0.6."))
60-
},
6158
scalaJSLinkerConfig ~= {
6259
_.withModuleKind(ModuleKind.CommonJSModule)
6360
},

project/plugins.sbt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
val scalaJSVersion =
2-
Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("1.1.1")
3-
4-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
1+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.1.1")
52
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.0")
63
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.4")
74
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")

script/release.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,4 @@
22

33
cat ./version.sbt
44

5-
export SCALAJS_VERSION=0.6.33
6-
sbt clean +publishSigned sonatypeBundleUpload sonatypeReleaseAll
7-
unset SCALAJS_VERSION
85
sbt clean +publishSigned sonatypeBundleUpload sonatypeReleaseAll

0 commit comments

Comments
 (0)