mirror of
https://github.com/bitcoin-s/bitcoin-s.git
synced 2025-02-22 22:36:34 +01:00
bump sbt to 1.1.6, bump scalac version to 2.11.12
Adding compilerOpts, adding commonSettings across projects
This commit is contained in:
parent
b4fea862fb
commit
42b0600051
5 changed files with 22 additions and 11 deletions
15
build.sbt
15
build.sbt
|
@ -1,4 +1,12 @@
|
|||
|
||||
|
||||
lazy val compilerOpts =
|
||||
List("-unchecked", "-deprecation", "-feature", "-Xmax-classfile-name", "128")
|
||||
|
||||
lazy val commonSettings = List(
|
||||
scalacOptions := compilerOpts,
|
||||
assemblyOption in assembly := (assemblyOption in assembly).value.copy(includeScala = false)
|
||||
)
|
||||
lazy val root = project
|
||||
.in(file("."))
|
||||
.aggregate(
|
||||
|
@ -9,14 +17,17 @@ lazy val root = project
|
|||
zmq,
|
||||
rpc
|
||||
)
|
||||
.settings(commonSettings: _*)
|
||||
|
||||
lazy val secp256k1jni = project
|
||||
.in(file("secp256k1jni"))
|
||||
.settings(commonSettings: _*)
|
||||
.enablePlugins()
|
||||
|
||||
lazy val core = project
|
||||
.in(file("core"))
|
||||
.enablePlugins()
|
||||
.settings(commonSettings: _*)
|
||||
.dependsOn(
|
||||
secp256k1jni
|
||||
)
|
||||
|
@ -24,6 +35,7 @@ lazy val core = project
|
|||
lazy val coreGen = project
|
||||
.in(file("core-gen"))
|
||||
.enablePlugins()
|
||||
.settings(commonSettings: _*)
|
||||
.dependsOn(
|
||||
core
|
||||
)
|
||||
|
@ -31,6 +43,7 @@ lazy val coreGen = project
|
|||
lazy val coreTest = project
|
||||
.in(file("core-test"))
|
||||
.enablePlugins()
|
||||
.settings(commonSettings: _*)
|
||||
.dependsOn(
|
||||
core,
|
||||
coreGen % "test->test"
|
||||
|
@ -39,6 +52,7 @@ lazy val coreTest = project
|
|||
lazy val zmq = project
|
||||
.in(file("zmq"))
|
||||
.enablePlugins()
|
||||
.settings(commonSettings: _*)
|
||||
.dependsOn(
|
||||
core
|
||||
)
|
||||
|
@ -46,6 +60,7 @@ lazy val zmq = project
|
|||
lazy val rpc = project
|
||||
.in(file("rpc"))
|
||||
.enablePlugins()
|
||||
.settings(commonSettings: _*)
|
||||
.dependsOn(
|
||||
core,
|
||||
coreGen % "test->test"
|
||||
|
|
|
@ -18,5 +18,3 @@ coverageMinimum := 90
|
|||
|
||||
coverageFailOnMinimum := true
|
||||
|
||||
assemblyOption in assembly := (assemblyOption in assembly).value
|
||||
.copy(includeScala = false)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
scalaVersion in ThisBuild := "2.11.7"
|
||||
scalaVersion in ThisBuild := "2.11.12"
|
||||
|
||||
scalacOptions in ThisBuild ++= Seq("-Xmax-classfile-name", "140")
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
sbt.version=0.13.17
|
||||
sbt.version=1.1.6
|
||||
|
|
|
@ -1,12 +1,10 @@
|
|||
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.2")
|
||||
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.7")
|
||||
|
||||
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")
|
||||
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.6")
|
||||
|
||||
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.3")
|
||||
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
|
||||
|
||||
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.3.5")
|
||||
|
||||
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.1.0")
|
||||
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.2.5")
|
||||
|
||||
|
||||
addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2")
|
||||
addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2")
|
||||
|
|
Loading…
Add table
Reference in a new issue