Skip to content

Commit d6d0f68

Browse files
ochafikfdietze
authored andcommitted
Cross compile with 2.12.3
1 parent ef48ae2 commit d6d0f68

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: scala
22
scala:
3-
- 2.11.7
4-
- 2.12.0-M2
3+
- 2.11.11
4+
- 2.12.3
55
jdk:
66
- oraclejdk8
77
git:

Resources/Benchmarks/build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ autoCompilerPlugins := true
1414

1515
libraryDependencies += "com.nativelibs4java" %% "scalaxy-streams" % "0.4-SNAPSHOT"
1616

17-
scalacOptions ++= Seq("-optimise", "-Yclosure-elim", "-Yinline")
17+
// scalacOptions ++= Seq("-optimise", "-Yclosure-elim", "-Yinline")
1818

1919
// scalacOptions += "-Xprint:cleanup"
2020

Resources/releaseTest/build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ scalaVersion := "2.11.4"
1212

1313
libraryDependencies += "com.nativelibs4java" %% "scalaxy-streams" % "0.3.4" % "provided"
1414

15-
scalacOptions ++= Seq("-optimise", "-Yclosure-elim", "-Yinline")
15+
// scalacOptions ++= Seq("-optimise", "-Yclosure-elim", "-Yinline")
1616

1717
// Scalaxy/Streams snapshots are published on the //Sonatype repository.
1818
// resolvers += Resolver.sonatypeRepo("snapshots")

build.sbt

+5-3
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@ version := "0.4-SNAPSHOT"
66

77
scalaVersion := "2.11.7"
88

9+
crossScalaVersions := Seq("2.12.3")
10+
911
resolvers += Resolver.sonatypeRepo("snapshots")
1012

1113
libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _)
1214

1315
libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-reflect" % _)
1416

1517
libraryDependencies ++= Seq(
16-
"org.scala-js" %% "scalajs-library" % "0.6.5" % "test",
18+
"org.scala-js" %% "scalajs-library" % "0.6.19" % "test",
1719
"junit" % "junit" % "4.12" % "test",
1820
"com.novocode" % "junit-interface" % "0.11" % "test"
1921
)
@@ -31,8 +33,8 @@ javaOptions += "-Xmx4G"
3133
scalacOptions ++= Seq(
3234
"-encoding", "UTF-8",
3335
"-deprecation", "-feature", "-unchecked",
34-
"-optimise", "-Yclosure-elim", "-Yinline",
35-
"-YclasspathImpl:flat",
36+
// "-optimise", "-Yclosure-elim", "-Yinline",
37+
// "-YclasspathImpl:flat",
3638
"-Xlog-free-types"
3739
)
3840

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.7
1+
sbt.version=0.13.16

src/test/scala/StreamComponentsTestBase.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ case class CompilerMessages(
1616
trait StreamComponentsTestBase extends Utils with ConsoleReporters
1717
{
1818
val global = scala.reflect.runtime.universe
19-
val commonOptions = "-usejavacp -YclasspathImpl:flat "
20-
val optOptions = "-optimise -Yclosure-elim -Yinline "//-Ybackend:GenBCode"
19+
val commonOptions = "-usejavacp "//-YclasspathImpl:flat "
20+
val optOptions = ""//"-optimise -Yclosure-elim -Yinline "//-Ybackend:GenBCode"
2121
import scala.reflect.runtime.currentMirror
2222

2323
private[this] lazy val toolbox = currentMirror.mkToolBox(options = commonOptions)

0 commit comments

Comments
 (0)