Skip to content

Commit bce348e

Browse files
committed
Merge pull request #11 from nativelibs4java/ochafik-2.12.0-M2
Build & deploy for scala 2.12.0-M2 in Travis (fixes #10)
2 parents 8983ae5 + fb6f301 commit bce348e

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
language: scala
22
scala:
33
- 2.11.7
4+
- 2.12.0-M2
5+
jdk:
6+
- oraclejdk8
47
git:
58
depth: 1
69
cache:

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _)
1313
libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-reflect" % _)
1414

1515
libraryDependencies ++= Seq(
16-
"org.scala-js" %% "scalajs-library" % "0.6.2" % "test",
16+
"org.scala-js" %% "scalajs-library" % "0.6.5" % "test",
1717
"junit" % "junit" % "4.12" % "test",
1818
"com.novocode" % "junit-interface" % "0.11" % "test"
1919
)

src/main/scala/streams/ops/ArrayOpsOps.scala

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,20 @@ private[streams] trait ArrayOpsOps
1818
"charArrayOps" |
1919
"booleanArrayOps" |
2020
"floatArrayOps" |
21-
"doubleArrayOps")) |
21+
"doubleArrayOps" |
22+
// These now have a _ prefix in 2.12.0-M2:
23+
"_intArrayOps" |
24+
"_longArrayOps" |
25+
"_byteArrayOps" |
26+
"_shortArrayOps" |
27+
"_charArrayOps" |
28+
"_booleanArrayOps" |
29+
"_floatArrayOps" |
30+
"_doubleArrayOps")) |
2231
TypeApply(
2332
Select(Predef(), N(
2433
"refArrayOps" |
34+
"_refArrayOps" |
2535
"genericArrayOps")),
2636
List(_)),
2737
List(array)) =>

0 commit comments

Comments
 (0)