chore: update and migrate to the last version of sbt

powerapi-ng · Apr 17, 2017 · 709f706 · 709f706
1 parent a337dc9
commit 709f706
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 94 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -35,7 +35,7 @@ addons:
 
 script:
   - sbt compile test:compile
-  - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then sbt "set concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)" "project powerapi-core" test; else sbt "set concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)" "project powerapi-core" coverage test ; fi'
+  - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then sbt "set concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)" "project core" test; else sbt "set concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)" "project core" coverage test ; fi'
   - find $HOME/.sbt -name "*.lock" | xargs rm
 
 before_install:
@@ -50,14 +50,14 @@ before_install:
   - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sudo bash -c "source /home/travis/.rvm/scripts/rvm; rvm use 2.2.3; gem install github_changelog_generator"; fi'
 
 after_success:
-  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt "project powerapi-core" coverageReport; fi'
-#  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt "project powerapi-core" codacyCoverage; fi'
-  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt "project powerapi-core" coveralls; fi'
+  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt "project core" coverageReport; fi'
+#  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt "project core" codacyCoverage; fi'
+  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt "project core" coveralls; fi'
 
 before_deploy:
-  - sbt "project powerapi-sampling" universal:packageZipTarball
-  - sbt "project powerapi-cli" universal:packageZipTarball
-  - sbt "project powerapi-daemon" universal:packageZipTarball
+  - sbt "project cpuSampling" universal:packageZipTarball
+  - sbt "project cli" universal:packageZipTarball
+  - sbt "project daemon" universal:packageZipTarball
   - tar -C powerapi-sampling/target/universal -xvf powerapi-sampling/target/universal/powerapi-sampling.tgz
   - tar -C powerapi-cli/target/universal -xvf powerapi-cli/target/universal/powerapi-cli.tgz
 
@@ -75,7 +75,7 @@ deploy:
     repo: Spirals-Team/powerapi
 
 after_deploy:
-  - sbt "project powerapi-core" publishSigned sonatypeRelease
+  - sbt "project core" publishSigned sonatypeRelease
   - github_changelog_generator Spirals-Team/powerapi --token $GITHUB_TOKEN
   - git config user.name "Travis CI"
   - git config user.email "builds@travis-ci.org"

diff --git a/build.sbt b/build.sbt
@@ -1,7 +1,56 @@
 name := "powerapi"
 
-// Logging
-libraryDependencies in ThisBuild ++= Seq(
-  "com.typesafe.scala-logging" %% "scala-logging" % "3.5.0",
-  "ch.qos.logback" % "logback-classic" % "1.1.7"
+lazy val downloadBluecove = taskKey[File]("download-bluecove-app")
+lazy val downloadBluecoveGpl = taskKey[File]("download-bluecove-gpl-app")
+
+val shared = Seq(
+  version := "4.2",
+  scalaVersion := "2.12.1",
+  scalacOptions := Seq(
+    "-language:existentials",
+    "-language:reflectiveCalls",
+    "-language:implicitConversions",
+    "-feature",
+    "-deprecation",
+    "-unchecked",
+    "-Xfatal-warnings"
+  ),
+  fork := true,
+  parallelExecution := false,
+  unmanagedBase := root.base.getAbsoluteFile / "external-libs",
+  unmanagedClasspath in Test += root.base.getAbsoluteFile  / "external-libs" / "sigar-bin",
+  unmanagedClasspath in (Compile, runMain) += root.base.getAbsoluteFile  / "external-libs" / "sigar-bin",
+  downloadBluecove := {
+    val locationBluecove = root.base.getAbsoluteFile / "external-libs" / "bluecove-2.1.0.jar"
+    if (!locationBluecove.exists()) IO.download(url("https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/bluecove/bluecove-2.1.0.jar"), locationBluecove)
+    locationBluecove
+  },
+  downloadBluecoveGpl := {
+    val locationBluecoveGpl = root.base.getAbsoluteFile / "external-libs" / "bluecove-gpl-2.1.0.jar"
+    if (!locationBluecoveGpl.exists()) IO.download(url("https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/bluecove/bluecove-gpl-2.1.0.jar"), locationBluecoveGpl)
+    locationBluecoveGpl
+  },
+  compile in Compile := (compile in Compile).dependsOn(downloadBluecove, downloadBluecoveGpl).value,
+  libraryDependencies ++= Seq(
+    "com.typesafe.scala-logging" %% "scala-logging" % "3.5.0",
+    "ch.qos.logback" % "logback-classic" % "1.1.7"
+  )
 )
+
+lazy val root: sbt.Project = (project in file(".")).aggregate(core, cli, cpuSampling, daemon).settings(shared)
+
+lazy val core = (project in file("powerapi-core")).settings(shared)
+lazy val cli = (project in file("powerapi-cli")).settings(shared).dependsOn(core % "compile -> compile; test -> test").enablePlugins(JavaAppPackaging)
+lazy val cpuSampling = (project in file("powerapi-sampling-cpu")).settings(shared).dependsOn(core % "compile -> compile; test -> test").enablePlugins(JavaAppPackaging)
+// NOT MAINTENED...
+lazy val daemon = (project in file("powerapi-daemon")).settings(shared).dependsOn(core % "compile -> compile; test -> test").enablePlugins(JavaServerAppPackaging)
+
+// example of power meters
+lazy val SDAppProcfsJava =  (project in file("powerapi-powermeter/AppMonitorProcFSJava")).settings(shared).dependsOn(core % "compile -> compile")
+lazy val SDAppProcfsScala =  (project in file("powerapi-powermeter/AppMonitorProcFSScala")).settings(shared).dependsOn(core % "compile -> compile")
+lazy val SDAppSigarJava =  (project in file("powerapi-powermeter/AppMonitorSigarJava")).settings(shared).dependsOn(core % "compile -> compile")
+lazy val SDAppSigarScala =  (project in file("powerapi-powermeter/AppMonitorSigarScala")).settings(shared).dependsOn(core % "compile -> compile")
+lazy val SDCpuOmegaWatt =  (project in file("powerapi-powermeter/CPUMonitorOmegaWatt")).settings(shared).dependsOn(core % "compile -> compile")
+lazy val SDCpuProcfs =  (project in file("powerapi-powermeter/CPUMonitorProcFS")).settings(shared).dependsOn(core % "compile -> compile")
+lazy val SDCpuRAPL =  (project in file("powerapi-powermeter/CPUMonitorRAPL")).settings(shared).dependsOn(core % "compile -> compile")
+lazy val SDCpuSigar =  (project in file("powerapi-powermeter/CPUMonitorSigar")).settings(shared).dependsOn(core % "compile -> compile")
diff --git a/project/PowerApiBuild.scala b/project/PowerApiBuild.scala
diff --git a/project/build.properties b/project/build.properties
@@ -20,4 +20,4 @@
 #
 # If not, please consult http://www.gnu.org/licenses/agpl-3.0.html.
 #
-sbt.version=0.13.13
+sbt.version=0.13.15
diff --git a/project/native-packager.sbt b/project/native-packager.sbt
@@ -1 +1 @@
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.4")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.2.0-M8")
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.4")
		addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.2.0-M8")