Skip to content

Commit 8120716

Browse files
committed
Fix build
1 parent 22204f0 commit 8120716

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

project/Build.scala

+17-15
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import sbtrelease.ReleasePlugin.autoImport._
2424

2525

2626
object Build extends SbtBuild {
27-
val dontPublishArtifact = Seq(
27+
val doNotPublishArtifact = Seq(
2828
publishArtifact := false,
2929
publishArtifact in (Compile, packageDoc) := false,
3030
publishArtifact in (Compile, packageSrc) := false,
@@ -40,6 +40,11 @@ object Build extends SbtBuild {
4040
"-Ywarn-nullary-override", "-Ywarn-nullary-unit"
4141
),
4242

43+
resolvers ++= Seq(
44+
"Typesafe Releases" at "http://repo.typesafe.com/typesafe/releases",
45+
Resolver.sonatypeRepo("releases")
46+
),
47+
4348
// ScalaDoc settings
4449
autoAPIMappings := true,
4550
scalacOptions in (Compile, doc) ++=
@@ -52,16 +57,6 @@ object Build extends SbtBuild {
5257
Seq("-sourcepath", bd.getAbsolutePath)
5358
},
5459

55-
resolvers ++= Seq(
56-
"Typesafe Releases" at "http://repo.typesafe.com/typesafe/releases",
57-
Resolver.sonatypeRepo("releases")
58-
),
59-
60-
libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-reflect" % _ % "compile"),
61-
62-
unmanagedSourceDirectories in Compile <+= baseDirectory(_ / ".." / "shared" / "src" / "main" / "scala"),
63-
unmanagedSourceDirectories in Test <+= baseDirectory(_ / ".." / "shared" / "src" / "test" / "scala"),
64-
6560
// -- Settings meant for deployment on oss.sonatype.org
6661

6762
publishMavenStyle := true,
@@ -100,13 +95,20 @@ object Build extends SbtBuild {
10095
</developers>
10196
)
10297

98+
val crossSettings = sharedSettings ++ Seq(
99+
libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-reflect" % _ % "compile"),
100+
101+
unmanagedSourceDirectories in Compile <+= baseDirectory(_ / ".." / "shared" / "src" / "main" / "scala"),
102+
unmanagedSourceDirectories in Test <+= baseDirectory(_ / ".." / "shared" / "src" / "test" / "scala")
103+
)
104+
103105
lazy val monifu = project.in(file("."))
104106
.aggregate(monifuJVM, monifuJS, tckTests)
105107
.settings(sharedSettings: _*)
106-
.settings(dontPublishArtifact: _*)
108+
.settings(doNotPublishArtifact: _*)
107109

108110
lazy val monifuJVM = project.in(file("jvm"))
109-
.settings(sharedSettings: _*)
111+
.settings(crossSettings: _*)
110112
.settings(
111113
name := "monifu",
112114
scalacOptions in (Compile, doc) ++= Opts.doc.title(s"Monifu"),
@@ -117,7 +119,7 @@ object Build extends SbtBuild {
117119
))
118120

119121
lazy val monifuJS = project.in(file("js"))
120-
.settings(sharedSettings: _*)
122+
.settings(crossSettings: _*)
121123
.enablePlugins(ScalaJSPlugin)
122124
.settings(
123125
name := "monifu",
@@ -130,7 +132,7 @@ object Build extends SbtBuild {
130132

131133
lazy val tckTests = project.in(file("tckTests"))
132134
.settings(sharedSettings: _*)
133-
.settings(dontPublishArtifact: _*)
135+
.settings(doNotPublishArtifact: _*)
134136
.dependsOn(monifuJVM)
135137
.settings(
136138
libraryDependencies ++= Seq(

0 commit comments

Comments
 (0)