cleaning branch, remove activator

rouvoy · Nov 4, 2014 · a4ae946 · a4ae946
1 parent cf0f6f5
commit a4ae946
Show file tree

Hide file tree

Showing 21 changed files with 12 additions and 354 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,11 @@
 *.log
 *~
 
+# activator specific
+activator*
+project/project
+project/target
+
 # sbt specific
 .history/
 .lib/

diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ When submitting code, please make every effort to follow existing conventions an
 
 # Acknowledgments
 We all stand on the shoulders of giants and get by with a little help from our friends. PowerAPI is written in [Scala](http://www.scala-lang.org) (version 2.11.4 under [3-clause BSD license](http://www.scala-lang.org/license.html)) and built on top of:
-* [Akka](http://akka.io) (version 2.2.4 under [Apache 2 license](http://www.apache.org/licenses/LICENSE-2.0)), for asynchronous processing
+* [Akka](http://akka.io) (version 2.3.6 under [Apache 2 license](http://www.apache.org/licenses/LICENSE-2.0)), for asynchronous processing
 
 # Licence
 This software is licensed under the *GNU Affero General Public License*, quoted below.

diff --git a/activator b/activator
diff --git a/activator-launch-1.2.10.jar b/activator-launch-1.2.10.jar
diff --git a/build.sbt b/build.sbt
@@ -2,14 +2,13 @@ name := """powerapi"""
 
 version := "1.0"
 
-scalaVersion := "2.11.1"
+scalaVersion := "2.11.4"
 
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-actor" % "2.3.4",
-  "com.typesafe.akka" %% "akka-testkit" % "2.3.4",
-  "org.scalatest" %% "scalatest" % "2.1.6" % "test",
-  "junit" % "junit" % "4.11" % "test",
-  "com.novocode" % "junit-interface" % "0.10" % "test"
+  "com.typesafe.akka" %% "akka-actor" % "2.3.6",
+  "com.typesafe" % "config" % "1.2.1",
+  "com.typesafe.akka" %% "akka-testkit" % "2.3.6" % "test",
+  "org.scalatest" %% "scalatest" % "2.2.2" % "test"
 )
 
-testOptions += Tests.Argument(TestFrameworks.JUnit, "-v")
+testOptions += Tests.Argument(TestFrameworks.JUnit, "-v")
diff --git a/project/build.properties b/project/build.properties
diff --git a/src/main/scala/org/powerapi/PowerMeter.scala b/src/main/scala/org/powerapi/PowerMeter.scala
diff --git a/src/main/scala/org/powerapi/module/libpfm/LibpfmFormula.scala b/src/main/scala/org/powerapi/module/libpfm/LibpfmFormula.scala
diff --git a/src/main/scala/org/powerapi/module/libpfm/LibpfmSensor.scala b/src/main/scala/org/powerapi/module/libpfm/LibpfmSensor.scala
diff --git a/src/main/scala/org/powerapi/module/powerspy/PowerspyFormula.scala b/src/main/scala/org/powerapi/module/powerspy/PowerspyFormula.scala
diff --git a/src/main/scala/org/powerapi/module/powerspy/PowerspySensor.scala b/src/main/scala/org/powerapi/module/powerspy/PowerspySensor.scala
diff --git a/src/main/scala/org/powerapi/module/procfs/cpumax/CpuMaxFormula.scala b/src/main/scala/org/powerapi/module/procfs/cpumax/CpuMaxFormula.scala
diff --git a/src/main/scala/org/powerapi/module/procfs/cpumax/CpuMaxSensor.scala b/src/main/scala/org/powerapi/module/procfs/cpumax/CpuMaxSensor.scala
diff --git a/src/main/scala/org/powerapi/module/procfs/cpureg/CpuRegFormula.scala b/src/main/scala/org/powerapi/module/procfs/cpureg/CpuRegFormula.scala
diff --git a/src/main/scala/org/powerapi/module/procfs/cpureg/CpuRegSensor.scala b/src/main/scala/org/powerapi/module/procfs/cpureg/CpuRegSensor.scala
diff --git a/src/main/scala/org/powerapi/module/rapl/RaplFormula.scala b/src/main/scala/org/powerapi/module/rapl/RaplFormula.scala
diff --git a/src/main/scala/org/powerapi/module/rapl/RaplSensor.scala b/src/main/scala/org/powerapi/module/rapl/RaplSensor.scala
diff --git a/src/main/scala/org/powerapi/module/sigar/SigarFormula.scala b/src/main/scala/org/powerapi/module/sigar/SigarFormula.scala
diff --git a/src/main/scala/org/powerapi/module/sigar/SigarSensor.scala b/src/main/scala/org/powerapi/module/sigar/SigarSensor.scala
diff --git a/src/main/scala/org/powerapi/reporter/ConsoleReporter.scala b/src/main/scala/org/powerapi/reporter/ConsoleReporter.scala
diff --git a/src/main/scala/org/powerapi/reporter/FileReporter.scala b/src/main/scala/org/powerapi/reporter/FileReporter.scala