Skip to content

Upgrade to Scala.js 1.0.0-M3. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 1, 2018
Merged

Upgrade to Scala.js 1.0.0-M3. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ scala:
jdk:
- oraclejdk8
env:
- SCALAJS_VERSION=1.0.0-M2
- SCALAJS_VERSION=1.0.0-M3
script:
- ./scripts/assemble-cli.sh $SCALAJS_VERSION $TRAVIS_SCALA_VERSION
cache:
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ inThisBuild(Def.settings(
scalaVersion := crossScalaVersions.value.head,
scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),

scalaJSVersion := "1.0.0-M2",
scalaJSVersion := "1.0.0-M3",
scalaJSBinaryVersion := binaryScalaJSVersion(scalaJSVersion.value),

scalaJSScalaVersions := Seq(
Expand Down Expand Up @@ -98,7 +98,7 @@ lazy val `scalajs-cli`: Project = project.in(file(".")).
commonSettings,

libraryDependencies ++= Seq(
"org.scala-js" %% "scalajs-tools" % scalaJSVersion.value,
"org.scala-js" %% "scalajs-linker" % scalaJSVersion.value,
"com.github.scopt" %% "scopt" % "3.5.0",
),

Expand Down
12 changes: 7 additions & 5 deletions src/main/scala/org/scalajs/cli/Scalajsld.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@

package org.scalajs.cli

import org.scalajs.core.ir.ScalaJSVersions
import org.scalajs.ir.ScalaJSVersions

import org.scalajs.core.tools.io._
import org.scalajs.core.tools.logging._
import org.scalajs.io._

import org.scalajs.core.tools.linker._
import org.scalajs.core.tools.linker.standard._
import org.scalajs.logging._

import org.scalajs.linker._
import org.scalajs.linker.irio._
import org.scalajs.linker.standard._

import CheckedBehavior.Compliant

Expand Down
12 changes: 7 additions & 5 deletions src/main/scala/org/scalajs/cli/Scalajsp.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@

package org.scalajs.cli

import org.scalajs.core.ir
import ir.ScalaJSVersions
import ir.Trees.{Tree, ClassDef}
import ir.Printers.IRTreePrinter
import org.scalajs.ir.ScalaJSVersions
import org.scalajs.ir.Trees.{Tree, ClassDef}
import org.scalajs.ir.Printers.IRTreePrinter

import org.scalajs.io._

import org.scalajs.linker.irio._

import org.scalajs.core.tools.io._
import scala.collection.immutable.Seq

import java.io.{Console => _, _}
Expand Down