Skip to content
This repository was archived by the owner on Mar 11, 2019. It is now read-only.

Commit 709f706

Browse files
committed
chore: update and migrate to the last version of sbt
1 parent a337dc9 commit 709f706

File tree

5 files changed

+63
-94
lines changed

5 files changed

+63
-94
lines changed

.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ addons:
3535

3636
script:
3737
- sbt compile test:compile
38-
- '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'
38+
- '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'
3939
- find $HOME/.sbt -name "*.lock" | xargs rm
4040

4141
before_install:
@@ -50,14 +50,14 @@ before_install:
5050
- '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'
5151

5252
after_success:
53-
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt "project powerapi-core" coverageReport; fi'
54-
# - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt "project powerapi-core" codacyCoverage; fi'
55-
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt "project powerapi-core" coveralls; fi'
53+
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt "project core" coverageReport; fi'
54+
# - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt "project core" codacyCoverage; fi'
55+
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then sbt "project core" coveralls; fi'
5656

5757
before_deploy:
58-
- sbt "project powerapi-sampling" universal:packageZipTarball
59-
- sbt "project powerapi-cli" universal:packageZipTarball
60-
- sbt "project powerapi-daemon" universal:packageZipTarball
58+
- sbt "project cpuSampling" universal:packageZipTarball
59+
- sbt "project cli" universal:packageZipTarball
60+
- sbt "project daemon" universal:packageZipTarball
6161
- tar -C powerapi-sampling/target/universal -xvf powerapi-sampling/target/universal/powerapi-sampling.tgz
6262
- tar -C powerapi-cli/target/universal -xvf powerapi-cli/target/universal/powerapi-cli.tgz
6363

@@ -75,7 +75,7 @@ deploy:
7575
repo: Spirals-Team/powerapi
7676

7777
after_deploy:
78-
- sbt "project powerapi-core" publishSigned sonatypeRelease
78+
- sbt "project core" publishSigned sonatypeRelease
7979
- github_changelog_generator Spirals-Team/powerapi --token $GITHUB_TOKEN
8080
- git config user.name "Travis CI"
8181
- git config user.email "builds@travis-ci.org"

build.sbt

Lines changed: 53 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,56 @@
11
name := "powerapi"
22

3-
// Logging
4-
libraryDependencies in ThisBuild ++= Seq(
5-
"com.typesafe.scala-logging" %% "scala-logging" % "3.5.0",
6-
"ch.qos.logback" % "logback-classic" % "1.1.7"
3+
lazy val downloadBluecove = taskKey[File]("download-bluecove-app")
4+
lazy val downloadBluecoveGpl = taskKey[File]("download-bluecove-gpl-app")
5+
6+
val shared = Seq(
7+
version := "4.2",
8+
scalaVersion := "2.12.1",
9+
scalacOptions := Seq(
10+
"-language:existentials",
11+
"-language:reflectiveCalls",
12+
"-language:implicitConversions",
13+
"-feature",
14+
"-deprecation",
15+
"-unchecked",
16+
"-Xfatal-warnings"
17+
),
18+
fork := true,
19+
parallelExecution := false,
20+
unmanagedBase := root.base.getAbsoluteFile / "external-libs",
21+
unmanagedClasspath in Test += root.base.getAbsoluteFile / "external-libs" / "sigar-bin",
22+
unmanagedClasspath in (Compile, runMain) += root.base.getAbsoluteFile / "external-libs" / "sigar-bin",
23+
downloadBluecove := {
24+
val locationBluecove = root.base.getAbsoluteFile / "external-libs" / "bluecove-2.1.0.jar"
25+
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)
26+
locationBluecove
27+
},
28+
downloadBluecoveGpl := {
29+
val locationBluecoveGpl = root.base.getAbsoluteFile / "external-libs" / "bluecove-gpl-2.1.0.jar"
30+
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)
31+
locationBluecoveGpl
32+
},
33+
compile in Compile := (compile in Compile).dependsOn(downloadBluecove, downloadBluecoveGpl).value,
34+
libraryDependencies ++= Seq(
35+
"com.typesafe.scala-logging" %% "scala-logging" % "3.5.0",
36+
"ch.qos.logback" % "logback-classic" % "1.1.7"
37+
)
738
)
39+
40+
lazy val root: sbt.Project = (project in file(".")).aggregate(core, cli, cpuSampling, daemon).settings(shared)
41+
42+
lazy val core = (project in file("powerapi-core")).settings(shared)
43+
lazy val cli = (project in file("powerapi-cli")).settings(shared).dependsOn(core % "compile -> compile; test -> test").enablePlugins(JavaAppPackaging)
44+
lazy val cpuSampling = (project in file("powerapi-sampling-cpu")).settings(shared).dependsOn(core % "compile -> compile; test -> test").enablePlugins(JavaAppPackaging)
45+
// NOT MAINTENED...
46+
lazy val daemon = (project in file("powerapi-daemon")).settings(shared).dependsOn(core % "compile -> compile; test -> test").enablePlugins(JavaServerAppPackaging)
47+
48+
// example of power meters
49+
lazy val SDAppProcfsJava = (project in file("powerapi-powermeter/AppMonitorProcFSJava")).settings(shared).dependsOn(core % "compile -> compile")
50+
lazy val SDAppProcfsScala = (project in file("powerapi-powermeter/AppMonitorProcFSScala")).settings(shared).dependsOn(core % "compile -> compile")
51+
lazy val SDAppSigarJava = (project in file("powerapi-powermeter/AppMonitorSigarJava")).settings(shared).dependsOn(core % "compile -> compile")
52+
lazy val SDAppSigarScala = (project in file("powerapi-powermeter/AppMonitorSigarScala")).settings(shared).dependsOn(core % "compile -> compile")
53+
lazy val SDCpuOmegaWatt = (project in file("powerapi-powermeter/CPUMonitorOmegaWatt")).settings(shared).dependsOn(core % "compile -> compile")
54+
lazy val SDCpuProcfs = (project in file("powerapi-powermeter/CPUMonitorProcFS")).settings(shared).dependsOn(core % "compile -> compile")
55+
lazy val SDCpuRAPL = (project in file("powerapi-powermeter/CPUMonitorRAPL")).settings(shared).dependsOn(core % "compile -> compile")
56+
lazy val SDCpuSigar = (project in file("powerapi-powermeter/CPUMonitorSigar")).settings(shared).dependsOn(core % "compile -> compile")

project/PowerApiBuild.scala

Lines changed: 0 additions & 80 deletions
This file was deleted.

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020
#
2121
# If not, please consult http://www.gnu.org/licenses/agpl-3.0.html.
2222
#
23-
sbt.version=0.13.13
23+
sbt.version=0.13.15

project/native-packager.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.4")
1+
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.2.0-M8")

0 commit comments

Comments
 (0)