mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-02-23 14:50:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

bump sbt to 1.1.6, bump scalac version to 2.11.12

Browse source 
Adding compilerOpts, adding commonSettings across projects
This commit is contained in:
Chris Stewart 2018-08-26 11:54:10 -05:00
parent b4fea862fb
commit 42b0600051
5 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
build.sbt
View file

@ -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 lazy val root = project
.in(file(".")) .in(file("."))
.aggregate( .aggregate(
@ -9,14 +17,17 @@ lazy val root = project
zmq, zmq,
rpc rpc
) )
.settings(commonSettings: _*)
lazy val secp256k1jni = project lazy val secp256k1jni = project
.in(file("secp256k1jni")) .in(file("secp256k1jni"))
.settings(commonSettings: _*)
.enablePlugins() .enablePlugins()
lazy val core = project lazy val core = project
.in(file("core")) .in(file("core"))
.enablePlugins() .enablePlugins()
.settings(commonSettings: _*)
.dependsOn( .dependsOn(
secp256k1jni secp256k1jni
) )
@ -24,6 +35,7 @@ lazy val core = project
lazy val coreGen = project lazy val coreGen = project
.in(file("core-gen")) .in(file("core-gen"))
.enablePlugins() .enablePlugins()
.settings(commonSettings: _*)
.dependsOn( .dependsOn(
core core
) )
@ -31,6 +43,7 @@ lazy val coreGen = project
lazy val coreTest = project lazy val coreTest = project
.in(file("core-test")) .in(file("core-test"))
.enablePlugins() .enablePlugins()
.settings(commonSettings: _*)
.dependsOn( .dependsOn(
core, core,
coreGen % "test->test" coreGen % "test->test"
@ -39,6 +52,7 @@ lazy val coreTest = project
lazy val zmq = project lazy val zmq = project
.in(file("zmq")) .in(file("zmq"))
.enablePlugins() .enablePlugins()
.settings(commonSettings: _*)
.dependsOn( .dependsOn(
core core
) )
@ -46,6 +60,7 @@ lazy val zmq = project
lazy val rpc = project lazy val rpc = project
.in(file("rpc")) .in(file("rpc"))
.enablePlugins() .enablePlugins()
.settings(commonSettings: _*)
.dependsOn( .dependsOn(
core, core,
coreGen % "test->test" coreGen % "test->test"

2
core/build.sbt
View file

@ -18,5 +18,3 @@ coverageMinimum := 90
coverageFailOnMinimum := true coverageFailOnMinimum := true
assemblyOption in assembly := (assemblyOption in assembly).value
.copy(includeScala = false)

2
inThisBuild.sbt
View file

@ -1,5 +1,5 @@
scalaVersion in ThisBuild := "2.11.7" scalaVersion in ThisBuild := "2.11.12"
scalacOptions in ThisBuild ++= Seq("-Xmax-classfile-name", "140") scalacOptions in ThisBuild ++= Seq("-Xmax-classfile-name", "140")

2
project/build.properties
View file

@ -1 +1 @@
sbt.version=0.13.17 sbt.version=1.1.6

10
project/plugins.sbt
View file

@ -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.2.5")
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.1.0")
addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2") addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2")