diff --git a/appveyor.yml b/appveyor.yml index b29cd629..24da74e8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,15 +6,12 @@ environment: SCALAJS_VERSION: 1.0.0 install: - ps: Install-Product node 12 - - cmd: choco install sbt --version 1.2.8 -ia "INSTALLDIR=""C:\sbt""" + - cmd: choco install sbt --version 1.4.0 -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: - # Normally this would be "^^%CI_SBT_VERSION%" but it looks like - # AppVeyor expands single '^' to '^^' to workaround the fact that in - # Windows batch files '^' serves as an escape charactor. - - cmd: sbt ";^%CI_SBT_VERSION%;test;runScripted" + - cmd: sbt ";^^%CI_SBT_VERSION%;test;runScripted" cache: - C:\sbt - C:\Users\appveyor\.ivy2\cache diff --git a/sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/static/build.sbt b/sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/static/build.sbt index 5ed10db9..6d907e2a 100644 --- a/sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/static/build.sbt +++ b/sbt-scalajs-bundler/src/sbt-test/sbt-scalajs-bundler/static/build.sbt @@ -18,7 +18,7 @@ webpackConfigFile in fullOptJS := Some(baseDirectory.value / "prod.webpack.confi // Execute the tests in browser-like environment requireJsDomEnv in Test := true -version in installJsdom := "16.2.0" +version in installJsdom := "16.4.0" webpackBundlingMode := BundlingMode.LibraryAndApplication()