Skip to content

Support for Scala Native #118

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 10 commits into from
Jul 31, 2017
Merged

Support for Scala Native #118

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1d73570
Initial support for Scala Native
Jun 19, 2017
1d825f6
Setup travis for native compilation
Jun 19, 2017
0cf4ce6
Run Precise on TravisCI
Jun 20, 2017
ee2513f
Upgrade Scala Native
Jul 11, 2017
fed1867
Skip compilation in Java 6
Jul 17, 2017
31895c5
Run Travis build in Trusty
Jul 17, 2017
ed16889
Configure Travis via a script
Jul 17, 2017
4f28290
Run on Trusty
Jul 17, 2017
7370390
Remove Scala Native dependencies when not in Scala 2.11
Jul 17, 2017
c70911d
Merge branch '1.0.x' into native
Jul 30, 2017
File filter

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
Remove Scala Native dependencies when not in Scala 2.11
  • Loading branch information
Antonio Alonso Dominguez committed Jul 17, 2017
commit 7370390a34b16ce85a4899c1e786959176dfa9e1
7 changes: 6 additions & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,12 @@ lazy val `scala-parser-combinators` = crossProject(JSPlatform, JVMPlatform, Nati
name := "scala-parser-combinators-native",
scalaVersion := "2.11.11",
skip in compile := System.getProperty("java.version").startsWith("1.6"),
test := {}
test := {},
libraryDependencies := {
if (!scalaVersion.value.startsWith("2.11"))
libraryDependencies.value.filterNot(_.organization == "org.scala-native")
else libraryDependencies.value
}
)

lazy val `scala-parser-combinatorsJVM` = `scala-parser-combinators`.jvm
Expand Down