remove useless files, add a new line separator in remaining files, up…

…date libraries
rouvoy · Nov 4, 2014 · 0106087 · 0106087
1 parent 58f47f4
commit 0106087
Show file tree

Hide file tree

Showing 28 changed files with 15 additions and 383 deletions.
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
 * [Typesage Config](https://github.com/typesafehub/config) (version 1.2.1 under [Apache 2 license](http://www.apache.org/licenses/LICENSE-2.0)), for reading configuration files.
 
 # Licence

diff --git a/build.sbt b/build.sbt
@@ -2,13 +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-actor" % "2.3.6",
   "com.typesafe" % "config" % "1.2.1",
-  "com.typesafe.akka" %% "akka-testkit" % "2.3.4" % "test",
-  "org.scalatest" %% "scalatest" % "2.1.6" % "test",
+  "com.typesafe.akka" %% "akka-testkit" % "2.3.6" % "test",
+  "org.scalatest" %% "scalatest" % "2.2.2" % "test",
   "junit" % "junit" % "4.11" % "test",
   "com.novocode" % "junit-interface" % "0.10" % "test"
 )

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/core/ClockActors.scala b/src/main/scala/org/powerapi/core/ClockActors.scala
@@ -191,4 +191,4 @@ class Clock(timeout: Timeout = Timeout(100.milliseconds)) extends Component with
 
     context.become(acquire)
   }
-}
+}
diff --git a/src/main/scala/org/powerapi/core/ClockChannel.scala b/src/main/scala/org/powerapi/core/ClockChannel.scala
@@ -73,4 +73,4 @@ trait ClockChannel {
 
   def subscribeOnBus: ActorRef => Unit = subscribe(ReportBus.eventBus)
   def publishOnBus: ClockTick => Unit = publish(ReportBus.eventBus)
-}
+}
diff --git a/src/main/scala/org/powerapi/core/Component.scala b/src/main/scala/org/powerapi/core/Component.scala
@@ -42,4 +42,4 @@ trait Component extends Actor with ActorLogging {
   def receive = LoggingReceive {
     acquire orElse default
   }
-}
+}
diff --git a/src/main/scala/org/powerapi/core/Message.scala b/src/main/scala/org/powerapi/core/Message.scala
@@ -91,4 +91,4 @@ class Channel {
   def publish(bus: EventBus)(report: R) = {
     bus.publish(report)
   }
-}
+}
diff --git a/src/main/scala/org/powerapi/core/Subscription.scala b/src/main/scala/org/powerapi/core/Subscription.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
-Original file line number
+Diff line change
@@ Expand Up @@
         context.become(acquire)
       }
-    }
+    }