@@ -24,7 +24,7 @@ import sbtrelease.ReleasePlugin.autoImport._
24
24
25
25
26
26
object Build extends SbtBuild {
27
- val dontPublishArtifact = Seq (
27
+ val doNotPublishArtifact = Seq (
28
28
publishArtifact := false ,
29
29
publishArtifact in (Compile , packageDoc) := false ,
30
30
publishArtifact in (Compile , packageSrc) := false ,
@@ -40,6 +40,11 @@ object Build extends SbtBuild {
40
40
" -Ywarn-nullary-override" , " -Ywarn-nullary-unit"
41
41
),
42
42
43
+ resolvers ++= Seq (
44
+ " Typesafe Releases" at " http://repo.typesafe.com/typesafe/releases" ,
45
+ Resolver .sonatypeRepo(" releases" )
46
+ ),
47
+
43
48
// ScalaDoc settings
44
49
autoAPIMappings := true ,
45
50
scalacOptions in (Compile , doc) ++=
@@ -52,16 +57,6 @@ object Build extends SbtBuild {
52
57
Seq (" -sourcepath" , bd.getAbsolutePath)
53
58
},
54
59
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
-
65
60
// -- Settings meant for deployment on oss.sonatype.org
66
61
67
62
publishMavenStyle := true ,
@@ -100,13 +95,20 @@ object Build extends SbtBuild {
100
95
</developers >
101
96
)
102
97
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
+
103
105
lazy val monifu = project.in(file(" ." ))
104
106
.aggregate(monifuJVM, monifuJS, tckTests)
105
107
.settings(sharedSettings : _* )
106
- .settings(dontPublishArtifact : _* )
108
+ .settings(doNotPublishArtifact : _* )
107
109
108
110
lazy val monifuJVM = project.in(file(" jvm" ))
109
- .settings(sharedSettings : _* )
111
+ .settings(crossSettings : _* )
110
112
.settings(
111
113
name := " monifu" ,
112
114
scalacOptions in (Compile , doc) ++= Opts .doc.title(s " Monifu " ),
@@ -117,7 +119,7 @@ object Build extends SbtBuild {
117
119
))
118
120
119
121
lazy val monifuJS = project.in(file(" js" ))
120
- .settings(sharedSettings : _* )
122
+ .settings(crossSettings : _* )
121
123
.enablePlugins(ScalaJSPlugin )
122
124
.settings(
123
125
name := " monifu" ,
@@ -130,7 +132,7 @@ object Build extends SbtBuild {
130
132
131
133
lazy val tckTests = project.in(file(" tckTests" ))
132
134
.settings(sharedSettings : _* )
133
- .settings(dontPublishArtifact : _* )
135
+ .settings(doNotPublishArtifact : _* )
134
136
.dependsOn(monifuJVM)
135
137
.settings(
136
138
libraryDependencies ++= Seq (
0 commit comments