Skip to content
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

Add support for cross compile to Scala.js #158

Merged
merged 5 commits into from
Jun 1, 2016
Rate limit · GitHub

Whoa there!

You have triggered an abuse detection mechanism.

Please wait a few minutes before you try again;
in some cases this may take up to an hour.

Merged

Add support for cross compile to Scala.js #158

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1db4609
Add support for scala.js
Jun 3, 2015
8b901a1
Add -XX:MaxMetaspaceSize only to JVM projects
lustefaniak Mar 29, 2016
16b8c00
Search for runtime classes in jvm for crossProject on jvm tests
lustefaniak Mar 29, 2016
e8dff1f
Upgrade to scala.js 0.6.9
lustefaniak May 21, 2016
dd36d9c
Get rid of scala.js compilation warnings
lustefaniak May 21, 2016
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
Prev Previous commit
Next Next commit
Add -XX:MaxMetaspaceSize only to JVM projects
Rate limit · GitHub

Access has been restricted

You have triggered a rate limit.

Please wait a few minutes before you try again;
in some cases this may take up to an hour.

@lustefaniak
lustefaniak committed Mar 29, 2016
commit 8b901a16667cbe44a7e202febae058834bc3f340
10 changes: 7 additions & 3 deletions project/Scoverage.scala
View file
Original file line number Diff line number Diff line change
@@ -29,7 +29,6 @@ object Scoverage extends Build {
resolvers := ("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2") +: resolvers.value,
concurrentRestrictions in Global += Tags.limit(Tags.Test, 1),
javacOptions := Seq("-source", "1.6", "-target", "1.6"),
javaOptions += "-XX:MaxMetaspaceSize=2048m",
publishTo <<= version {
(v: String) =>
val nexus = "https://oss.sonatype.org/"
@@ -71,15 +70,19 @@ object Scoverage extends Build {
.settings(name := "scalac-scoverage")
.settings(appSettings: _*)
.settings(publishArtifact := false)
.settings(javaOptions += "-XX:MaxMetaspaceSize=2048m")
.aggregate(plugin, runtime.jvm, runtime.js)

lazy val runtime = CrossProject("scalac-scoverage-runtime", file("scalac-scoverage-runtime"), CrossType.Full)
.settings(name := "scalac-scoverage-runtime")
.settings(appSettings: _*)
.jvmSettings(libraryDependencies ++= Seq(
.jvmSettings(
libraryDependencies ++= Seq(
"org.mockito" % "mockito-all" % MockitoVersion % "test",
"org.scalatest" %% "scalatest" % ScalatestVersion % "test"
))
),
javaOptions += "-XX:MaxMetaspaceSize=2048m"
)
.jsSettings(
libraryDependencies += "org.scalatest" %%% "scalatest" % ScalatestVersion,
scalaJSStage := FastOptStage
@@ -92,6 +95,7 @@ object Scoverage extends Build {
.dependsOn(`scalac-scoverage-runtimeJVM` % "test")
.settings(name := "scalac-scoverage-plugin")
.settings(appSettings: _*)
.settings(javaOptions += "-XX:MaxMetaspaceSize=2048m")
.settings(libraryDependencies ++= Seq(
"org.mockito" % "mockito-all" % MockitoVersion % "test",
"org.scalatest" %% "scalatest" % ScalatestVersion % "test",