From bd8d0876f02e65279992cd170f03ce466f4d1d5c Mon Sep 17 00:00:00 2001 From: exoego Date: Fri, 31 Jul 2020 15:21:20 +0900 Subject: [PATCH] Drop Scala.js 0.6 --- .travis.yml | 3 +-- project/MySettings.scala | 3 --- project/plugins.sbt | 5 +---- script/release.sh | 3 --- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 07a9b4df7..217dcb167 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 && diff --git a/project/MySettings.scala b/project/MySettings.scala index 0add2e2a2..a0848996e 100644 --- a/project/MySettings.scala +++ b/project/MySettings.scala @@ -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) }, diff --git a/project/plugins.sbt b/project/plugins.sbt index b619fe389..82623fee8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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") diff --git a/script/release.sh b/script/release.sh index 88051ac51..925db65b4 100755 --- a/script/release.sh +++ b/script/release.sh @@ -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