Skip to content

Commit 3f65bac

Browse files
committed
Fix the build for simple uses.
1 parent e6239c5 commit 3f65bac

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

build.sbt

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,21 @@
11
import sbt.Keys._
22
import org.scalajs.sbtplugin.cross.CrossProject
33

4+
val commonSettings: Seq[Setting[_]] = Seq(
5+
version := "0.0.1-SNAPSHOT",
6+
organization := "org.scala-js",
7+
scalaVersion := "2.11.7",
8+
scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),
9+
homepage := Some(url(http://github.com/%3Cspan%20class=%22pl-s%22%3E%3Cspan%20class=%22pl-pds%22%3E"%3C/span%3Ehttp://scala-js.org/%3Cspan%20class=%22pl-pds%22%3E"%3C/span%3E%3C/span%3E)),
10+
licenses += ("MIT", url(http://github.com/%3Cspan%20class=%22pl-s%22%3E%3Cspan%20class=%22pl-pds%22%3E"%3C/span%3Ehttp://opensource.org/licenses/mit-license.php%3Cspan%20class=%22pl-pds%22%3E"%3C/span%3E%3C/span%3E))
11+
)
12+
413
lazy val root: Project = project.in(file(".")).
5-
enablePlugins(ScalaJSPlugin)
14+
enablePlugins(ScalaJSPlugin).
15+
settings(commonSettings).
16+
settings(
17+
name := "scalajs-java-time"
18+
)
619

720
lazy val testSuite = CrossProject(
821
jvmId = "testSuiteJVM",
@@ -11,32 +24,20 @@ lazy val testSuite = CrossProject(
1124
crossType = CrossType.Full
1225
).
1326
jsConfigure(_ .enablePlugins(ScalaJSJUnitPlugin)).
27+
settings(commonSettings: _*).
1428
settings(
1529
testOptions +=
1630
Tests.Argument(TestFramework("com.novocode.junit.JUnitFramework"), "-v", "-a")
1731
).
1832
jsSettings(
1933
name := "java.time testSuite on JS"
2034
).
35+
jsConfigure(_.dependsOn(root)).
2136
jvmSettings(
2237
name := "java.time testSuite on JVM",
2338
libraryDependencies +=
2439
"com.novocode" % "junit-interface" % "0.9" % "test"
2540
)
2641

27-
lazy val testSuiteJS = testSuite.js.dependsOn(root)
28-
lazy val testSuiteJVM = testSuite.jvm.dependsOn(root)
29-
30-
name := "scalajs-java-time"
31-
32-
version := "0.0.1-SNAPSHOT"
33-
34-
organization := "org.scala-js"
35-
36-
scalaVersion := "2.11.7"
37-
38-
scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings")
39-
40-
homepage := Some(url(http://github.com/%3Cspan%20class=%22pl-s%22%3E%3Cspan%20class=%22pl-pds%22%3E"%3C/span%3Ehttp://scala-js.org/%3Cspan%20class=%22pl-pds%22%3E"%3C/span%3E%3C/span%3E))
41-
42-
licenses += ("MIT", url(http://github.com/%3Cspan%20class=%22pl-s%22%3E%3Cspan%20class=%22pl-pds%22%3E"%3C/span%3Ehttp://opensource.org/licenses/mit-license.php%3Cspan%20class=%22pl-pds%22%3E"%3C/span%3E%3C/span%3E))
42+
lazy val testSuiteJS = testSuite.js
43+
lazy val testSuiteJVM = testSuite.jvm

0 commit comments

Comments
 (0)