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

Jump to bottom

Removed not used sbt-scala-native plugin and fixed importing the project into intellij #2382

Merged
merged 2 commits into from
Oct 12, 2018
Merged

Removed not used sbt-scala-native plugin and fixed importing the project into intellij #2382

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c51c693
Removed not used sbt-scala-native plugin and fixed importing the proj…
LukaszMarchewka Aug 11, 2018
1a8bd84
Merge branch 'master' into fixed_idea
kailuowang Oct 12, 2018
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
6 changes: 6 additions & 0 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@ lazy val commonJvmSettings = Seq(
}
)

lazy val commonNativeSettings = Seq(
scalaVersion := "2.11.12", //TODO load scala version form .travis.yml: https://github.com/dwijnand/sbt-travisci/issues/11
crossScalaVersions := Seq("2.11.12")
)

lazy val includeGeneratedSrc: Setting[_] = {
mappings in (Compile, packageSrc) ++= {
val base = (sourceManaged in Compile).value
Expand Down Expand Up @@ -340,6 +345,7 @@ lazy val kernel = crossProject(JSPlatform, JVMPlatform, NativePlatform)
.settings(includeGeneratedSrc)
.jsSettings(commonJsSettings)
.jvmSettings(commonJvmSettings ++ mimaSettings("cats-kernel"))
.nativeSettings(commonNativeSettings)


lazy val kernelJVM = kernel.jvm
Expand Down