From 1310c0ff8cede6575debb72a0bfdbe66b42f274e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Wed, 10 Apr 2019 15:27:36 +0200 Subject: [PATCH 1/2] Upgrade to Scala.js 1.0.0-M7. --- .travis.yml | 2 +- appveyor.yml | 2 +- build.sbt | 2 +- src/main/scala/org/scalajs/cli/Scalajsld.scala | 9 +++++++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 117cf59..b313cd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ scala: jdk: - oraclejdk8 env: - - SCALAJS_VERSION=1.0.0-M6 + - SCALAJS_VERSION=1.0.0-M7 script: - ./scripts/assemble-cli.sh $SCALAJS_VERSION $TRAVIS_SCALA_VERSION cache: diff --git a/appveyor.yml b/appveyor.yml index d16c31e..dfe9883 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ version: '{build}' os: Windows Server 2012 environment: global: - SCALAJS_VERSION: 1.0.0-M6 + SCALAJS_VERSION: 1.0.0-M7 matrix: - SCALA_VERSION: 2.11.12 - SCALA_VERSION: 2.12.6 diff --git a/build.sbt b/build.sbt index f950911..5edbb56 100644 --- a/build.sbt +++ b/build.sbt @@ -33,7 +33,7 @@ inThisBuild(Def.settings( scalaVersion := crossScalaVersions.value.head, scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"), - scalaJSVersion := "1.0.0-M6", + scalaJSVersion := "1.0.0-M7", scalaJSBinaryVersion := binaryScalaJSVersion(scalaJSVersion.value), scalaJSScalaVersions := Seq( diff --git a/src/main/scala/org/scalajs/cli/Scalajsld.scala b/src/main/scala/org/scalajs/cli/Scalajsld.scala index a8d0aa7..6809f46 100644 --- a/src/main/scala/org/scalajs/cli/Scalajsld.scala +++ b/src/main/scala/org/scalajs/cli/Scalajsld.scala @@ -22,6 +22,10 @@ import CheckedBehavior.Compliant import scala.collection.immutable.Seq +import scala.concurrent.Await +import scala.concurrent.duration.Duration +import scala.concurrent.ExecutionContext.Implicits.global + import java.io.File import java.net.URI @@ -172,8 +176,9 @@ object Scalajsld { val output = LinkerOutput(outFile) val cache = (new IRFileCache).newCache - linker.link(cache.cached(irContainers), moduleInitializers, output, - logger) + val future = linker.link(cache.cached(irContainers), moduleInitializers, + output, logger) + Await.result(future, Duration.Inf) } } } From 596aa0a6374ae4bbdd732de55b9931761cf1eb66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Wed, 10 Apr 2019 15:30:00 +0200 Subject: [PATCH 2/2] Add Scala 2.12.8 to the list of supported versions. And make it the reference 2.12.x version. --- .travis.yml | 2 +- appveyor.yml | 2 +- build.sbt | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b313cd7..a2afc38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: false language: scala scala: - 2.11.12 - - 2.12.6 + - 2.12.8 jdk: - oraclejdk8 env: diff --git a/appveyor.yml b/appveyor.yml index dfe9883..7f22792 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,7 @@ environment: SCALAJS_VERSION: 1.0.0-M7 matrix: - SCALA_VERSION: 2.11.12 - - SCALA_VERSION: 2.12.6 + - SCALA_VERSION: 2.12.8 install: - cmd: choco install sbt --version 1.0.2 -ia "INSTALLDIR=""C:\sbt""" - cmd: SET PATH=C:\sbt\bin;%JAVA_HOME%\bin;%PATH% diff --git a/build.sbt b/build.sbt index 5edbb56..b1db035 100644 --- a/build.sbt +++ b/build.sbt @@ -29,7 +29,7 @@ inThisBuild(Def.settings( version := "1.0.0-SNAPSHOT", organization := "org.scala-js", - crossScalaVersions := Seq("2.12.6", "2.11.12"), + crossScalaVersions := Seq("2.12.8", "2.11.12"), scalaVersion := crossScalaVersions.value.head, scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"), @@ -54,6 +54,7 @@ inThisBuild(Def.settings( "2.12.5", "2.12.6", "2.12.7", + "2.12.8", ), homepage := Some(url("https://www.scala-js.org/")),