Merge pull request #70 from kailuowang/new-way-3

clean up build file and remove sigar
iheartradio · Oct 6, 2016 · b78c599 · b78c599
2 parents ac434b5 + 90bfa28
commit b78c599
Show file tree

Hide file tree

Showing 27 changed files with 10 additions and 30 deletions.
diff --git a/build.sbt b/build.sbt
@@ -70,7 +70,7 @@ val commonSettings = Seq(
   scalacOptions ++= Seq(
     "-feature",
     "-deprecation",
-    "-unchecked",
-    "-Xlint"
+//    "-Xlint",
+    "-unchecked"
   )
 )
diff --git a/example/backend/sigar/libsigar-amd64-freebsd-6.so b/example/backend/sigar/libsigar-amd64-freebsd-6.so
diff --git a/example/backend/sigar/libsigar-amd64-linux.so b/example/backend/sigar/libsigar-amd64-linux.so
diff --git a/example/backend/sigar/libsigar-amd64-solaris.so b/example/backend/sigar/libsigar-amd64-solaris.so
diff --git a/example/backend/sigar/libsigar-ia64-hpux-11.sl b/example/backend/sigar/libsigar-ia64-hpux-11.sl
diff --git a/example/backend/sigar/libsigar-ia64-linux.so b/example/backend/sigar/libsigar-ia64-linux.so
diff --git a/example/backend/sigar/libsigar-pa-hpux-11.sl b/example/backend/sigar/libsigar-pa-hpux-11.sl
diff --git a/example/backend/sigar/libsigar-ppc-aix-5.so b/example/backend/sigar/libsigar-ppc-aix-5.so
diff --git a/example/backend/sigar/libsigar-ppc-linux.so b/example/backend/sigar/libsigar-ppc-linux.so
diff --git a/example/backend/sigar/libsigar-ppc64-aix-5.so b/example/backend/sigar/libsigar-ppc64-aix-5.so
diff --git a/example/backend/sigar/libsigar-ppc64-linux.so b/example/backend/sigar/libsigar-ppc64-linux.so
diff --git a/example/backend/sigar/libsigar-s390x-linux.so b/example/backend/sigar/libsigar-s390x-linux.so
diff --git a/example/backend/sigar/libsigar-sparc-solaris.so b/example/backend/sigar/libsigar-sparc-solaris.so
diff --git a/example/backend/sigar/libsigar-sparc64-solaris.so b/example/backend/sigar/libsigar-sparc64-solaris.so
diff --git a/example/backend/sigar/libsigar-universal-macosx.dylib b/example/backend/sigar/libsigar-universal-macosx.dylib
diff --git a/example/backend/sigar/libsigar-universal64-macosx.dylib b/example/backend/sigar/libsigar-universal64-macosx.dylib
diff --git a/example/backend/sigar/libsigar-x86-freebsd-5.so b/example/backend/sigar/libsigar-x86-freebsd-5.so
diff --git a/example/backend/sigar/libsigar-x86-freebsd-6.so b/example/backend/sigar/libsigar-x86-freebsd-6.so
diff --git a/example/backend/sigar/libsigar-x86-linux.so b/example/backend/sigar/libsigar-x86-linux.so
diff --git a/example/backend/sigar/libsigar-x86-solaris.so b/example/backend/sigar/libsigar-x86-solaris.so
diff --git a/example/backend/sigar/sigar-amd64-winnt.dll b/example/backend/sigar/sigar-amd64-winnt.dll
diff --git a/example/backend/sigar/sigar-x86-winnt.dll b/example/backend/sigar/sigar-x86-winnt.dll
diff --git a/example/backend/sigar/sigar-x86-winnt.lib b/example/backend/sigar/sigar-x86-winnt.lib
diff --git a/example/build.sbt b/example/build.sbt
@@ -13,8 +13,8 @@ val resolverSetting = resolvers ++= Seq(
 val commonSettings = Seq(
   organization := "asobu",
   version := "2.4.3",
-  scalaVersion := "2.11.7",
-
+  scalaVersion := "2.11.8",
+  addCompilerPlugin("com.milessabin" % "si2712fix-plugin" % "1.2.0" cross CrossVersion.full),
   // build info
   buildInfoPackage := "meta",
   buildInfoOptions ++= Seq(BuildInfoOption.ToJson),
@@ -42,15 +42,7 @@ lazy val frontend = (project in file("frontend"))
         name := "cluster-play-frontend",
         libraryDependencies ++= (Dependencies.frontend  ++ Dependencies.kanaloa ++ Seq(filters, cache)),
         routesGenerator := InjectedRoutesGenerator,
-        javaOptions ++= Seq(
-            "-Djava.library.path=" + (baseDirectory.value.getParentFile / "backend" / "sigar" ).getAbsolutePath,
-            "-Xms128m", "-Xmx1024m"),
         fork in run := true,
-        mappings in Universal ++= directory(baseDirectory.value.getParentFile / "backend" / "sigar"),
-        bashScriptExtraDefines ++= Seq(
-          """declare -r sigar_dir="$(realpath "${app_home}/../sigar")"""",
-          """addJava "-Djava.library.path=${sigar_dir}""""
-        ),
         commonSettings
     ).dependsOn(api)
 
@@ -61,16 +53,7 @@ lazy val backend = (project in file("backend"))
     .settings(
         name := "cluster-akka-backend",
         libraryDependencies ++= Dependencies.backend,
-        javaOptions ++= Seq(
-            "-Djava.library.path=" + (baseDirectory.value / "sigar").getAbsolutePath,
-            "-Xms128m", "-Xmx1024m"),
-        // this enables custom javaOptions
         fork in run := true,
-        mappings in Universal ++= directory(baseDirectory.value / "sigar"),
-        bashScriptExtraDefines ++= Seq(
-          """declare -r sigar_dir="$(realpath "${app_home}/../sigar")"""",
-          """addJava "-Djava.library.path=${sigar_dir}""""
-        ),
         commonSettings
     ).dependsOn(api)
 

diff --git a/example/project/dependencies.scala b/example/project/dependencies.scala
@@ -8,14 +8,14 @@ object Dependencies {
   }
 
   lazy val frontend = common ++ tests ++ playSwagger
-  lazy val backend = common ++ metrics ++ tests ++ play ++ playSwagger
+  lazy val backend = common ++ tests ++ play ++ playSwagger
 
   val play = Seq(
     "com.typesafe.play" %% "play" % Version.play
   )
 
   val playSwagger = Seq(
-    "com.iheart" %% "play-swagger" % "0.5.2",
+    "com.iheart" %% "play-swagger" % "0.5.3",
     "org.webjars" % "swagger-ui" % "2.1.4"
   )
 
@@ -28,18 +28,15 @@ object Dependencies {
     "com.google.guava" % "guava" % "18.0"
   )
 
-  val metrics = Seq(
-    "io.kamon" % "sigar-loader" % "1.6.6-rev002"
-  )
-
   val tests = Seq(
     "org.scalatest" %% "scalatest" % "2.2.4" % "test",
     "org.scalatestplus" %% "play" % "1.4.0-M3" % "test",
     "com.typesafe.akka" %% "akka-testkit" % Version.akka % "test"
   )
 
   val kanaloa = Seq(
-    "com.iheart" %% "kanaloa" % "0.3.0"
+    "com.iheart" %% "kanaloa-core" % "0.4.0"
   )
 
+
 }
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -26,7 +26,7 @@ object Dependencies {
 
   val typelevel = Seq(
     "org.typelevel" %% "cats" % "0.7.2",
-    "org.typelevel" %% "kittens" % "1.0.0-M4"
+    "org.typelevel" %% "kittens" % "1.0.0-M5"
   )
 
 

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.4.3-SNAPSHOT"
+version in ThisBuild := "0.5.0-SNAPSHOT"