From d02329f7d6cd47c21acdad52956cb4b75a52c9d2 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 5 Oct 2015 13:45:01 +0100 Subject: [PATCH 1/4] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 10a49eb..18789da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: scala scala: - 2.11.7 +- 2.12.0-M2 git: depth: 1 cache: From 8213a5727b294c6ae547d80dc54b5dcd4cecb305 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 5 Oct 2015 13:51:25 +0100 Subject: [PATCH 2/4] Move to scalajs-library 0.6.5 for 2.12.0-M2 compat --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index a13028e..0a6f79d 100644 --- a/build.sbt +++ b/build.sbt @@ -13,7 +13,7 @@ libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _) libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-reflect" % _) libraryDependencies ++= Seq( - "org.scala-js" %% "scalajs-library" % "0.6.2" % "test", + "org.scala-js" %% "scalajs-library" % "0.6.5" % "test", "junit" % "junit" % "4.12" % "test", "com.novocode" % "junit-interface" % "0.11" % "test" ) From ce3d40dea2d95657143b05c16e95aaea341bea8c Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 5 Oct 2015 13:55:53 +0100 Subject: [PATCH 3/4] Move to jdk8 on travis for 2.12.0-M2 compat --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 18789da..0791245 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ language: scala scala: - 2.11.7 - 2.12.0-M2 +jdk: +- oraclejdk8 git: depth: 1 cache: From fb6f30167c86491d06043dd8c72ff0ffb26e039c Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 5 Oct 2015 16:40:34 +0100 Subject: [PATCH 4/4] Match new 2.12.x name of Predef.*ArrayOps helpers --- src/main/scala/streams/ops/ArrayOpsOps.scala | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/scala/streams/ops/ArrayOpsOps.scala b/src/main/scala/streams/ops/ArrayOpsOps.scala index 731f94b..1964453 100644 --- a/src/main/scala/streams/ops/ArrayOpsOps.scala +++ b/src/main/scala/streams/ops/ArrayOpsOps.scala @@ -18,10 +18,20 @@ private[streams] trait ArrayOpsOps "charArrayOps" | "booleanArrayOps" | "floatArrayOps" | - "doubleArrayOps")) | + "doubleArrayOps" | + // These now have a _ prefix in 2.12.0-M2: + "_intArrayOps" | + "_longArrayOps" | + "_byteArrayOps" | + "_shortArrayOps" | + "_charArrayOps" | + "_booleanArrayOps" | + "_floatArrayOps" | + "_doubleArrayOps")) | TypeApply( Select(Predef(), N( "refArrayOps" | + "_refArrayOps" | "genericArrayOps")), List(_)), List(array)) =>