Merge remote-tracking branch 'scalajs/master' into scala-versions

Author: clutroth

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         scalaversion: ["2.11.12", "2.12.10", "2.13.1"]
-        scalajsversion: ["1.5.0"]
+        scalajsversion: ["1.7.1"]
     steps:
       - uses: actions/checkout@v2
       - uses: olafurpg/setup-scala@v10

appveyor.yml

@@ -2,18 +2,18 @@ version: '{build}'
 os: Windows Server 2012
 environment:
   global:
-    SCALAJS_VERSION: 1.5.0
+    SCALAJS_VERSION: 1.7.1
   matrix:
     - SCALA_VERSION: 2.11.12
     - SCALA_VERSION: 2.12.15
     - SCALA_VERSION: 2.13.6
 install:
-  - cmd: choco install sbt --version 1.0.2 -ia "INSTALLDIR=""C:\sbt"""
+  - cmd: choco install sbt --version 1.5.5 -ia "INSTALLDIR=""C:\sbt"""
   - cmd: SET PATH=C:\sbt\bin;%JAVA_HOME%\bin;%PATH%
   - cmd: SET SBT_OPTS=-XX:MaxPermSize=2g -Xmx4g
 build: off
 test_script:
-  - cmd: sbt ";clean;++%SCALA_VERSION%;set scalaJSVersion in ThisBuild := \"%SCALAJS_VERSION%\";cliPack"
+  - cmd: sbt ";clean;++%SCALA_VERSION%;set ThisBuild / scalaJSVersion := \"%SCALAJS_VERSION%\";cliPack"
 cache:
   - C:\sbt
   - C:\Users\appveyor\.ivy2\cache

build.sbt

@@ -11,14 +11,14 @@ val cliPack =
   taskKey[File]("Pack the CLI for the current configuration")
 
 inThisBuild(Def.settings(
-  version := "1.5.0-SNAPSHOT",
+  version := "1.7.1-SNAPSHOT",
   organization := "org.scala-js",
 
   crossScalaVersions := Seq("2.11.12", "2.12.15", "2.13.6"),
   scalaVersion := crossScalaVersions.value.head,
   scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),
 
-  scalaJSVersion := "1.5.0",
+  scalaJSVersion := "1.7.1",
 
   scalaJSScalaVersions := Seq(
     "2.11.12",
@@ -96,9 +96,9 @@ lazy val `scalajs-cli`: Project = project.in(file(".")).
     ),
 
     // assembly options
-    mainClass in assembly := None, // don't want an executable JAR
-    assemblyOption in assembly ~= { _.copy(includeScala = false) },
-    assemblyJarName in assembly :=
+    assembly / mainClass := None, // don't want an executable JAR
+    assembly / assemblyOption ~= { _.copy(includeScala = false) },
+    assembly / assemblyJarName :=
       s"${normalizedName.value}-assembly_${scalaBinaryVersion.value}-${scalaJSVersion.value}.jar",
 
     cliLibJars := {
@@ -145,17 +145,17 @@ lazy val `scalajs-cli`: Project = project.in(file(".")).
       cliAssemblyJar +: resolvedLibJars
     },
 
-    target in cliPack := baseDirectory.value / "pack",
-    moduleName in cliPack :=
+    cliPack / target := baseDirectory.value / "pack",
+    cliPack / moduleName :=
       s"scalajs_${scalaBinaryVersion.value}-${scalaJSVersion.value}",
-    crossTarget in cliPack :=
-      (target in cliPack).value / (moduleName in cliPack).value,
+    cliPack / crossTarget :=
+      (cliPack / target).value / (cliPack / moduleName).value,
 
     cliPack := {
       val scalaBinVer = scalaBinaryVersion.value
       val sjsVer = scalaJSVersion.value
 
-      val trg = (crossTarget in cliPack).value
+      val trg = (cliPack / crossTarget).value
       val trgLib = trg / "lib"
       val trgBin = trg / "bin"
 
@@ -169,7 +169,7 @@ lazy val `scalajs-cli`: Project = project.in(file(".")).
       }
 
       IO.createDirectory(trgBin)
-      val scriptDir = (resourceDirectory in Compile).value
+      val scriptDir = (Compile / resourceDirectory).value
       for {
         scriptFile <- IO.listFiles(scriptDir)
         if !scriptFile.getPath.endsWith("~")

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.5.5

src/main/scala/org/scalajs/cli/Scalajsld.scala

@@ -128,7 +128,7 @@ object Scalajsld {
         }
         .text("Use compliant asInstanceOfs")
       opt[Unit]("es2015")
-        .action { (_, c) => c.copy(esFeatures = c.esFeatures.withUseECMAScript2015(true)) }
+        .action { (_, c) => c.copy(esFeatures = c.esFeatures.withESVersion(ESVersion.ES2015)) }
         .text("Use ECMAScript 2015")
       opt[ModuleKind]('k', "moduleKind")
         .action { (kind, c) => c.copy(moduleKind = kind) }