Repository: incubator-gearpump Updated Branches: refs/heads/master ec667d45d -> 51daa45c8
fix GEARPUMP-174 update shaded akka-kryo version to 0.4.1 Author: huafengw <[email protected]> Closes #58 from huafengw/update. Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/51daa45c Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/51daa45c Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/51daa45c Branch: refs/heads/master Commit: 51daa45c8d803d6cdee0b56a1116598248658975 Parents: ec667d4 Author: huafengw <[email protected]> Authored: Thu Jul 7 16:50:13 2016 +0800 Committer: manuzhang <[email protected]> Committed: Thu Jul 7 16:50:13 2016 +0800 ---------------------------------------------------------------------- .travis.yml | 2 ++ project/BuildShaded.scala | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/51daa45c/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 6e1ae7a..e4706f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,8 @@ language: - scala sudo: false before_script: +- rm -rf $HOME/.m2 +- rm -rf $HOME/.ivy2 - mkdir -p $HOME/.sbt/launchers/0.13.11/ - curl -L -o $HOME/.sbt/launchers/0.13.11/sbt-launch.jar http://dl.bintray.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/0.13.11/sbt-launch.jar script: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/51daa45c/project/BuildShaded.scala ---------------------------------------------------------------------- diff --git a/project/BuildShaded.scala b/project/BuildShaded.scala index 9fdfb9e..8088206 100644 --- a/project/BuildShaded.scala +++ b/project/BuildShaded.scala @@ -24,19 +24,20 @@ object BuildShaded extends sbt.Build { val guavaVersion = "16.0.1" val codahaleVersion = "3.0.2" - val kryoVersion = "0.3.2" + val kryoVersion = "0.4.1" val gsCollectionsVersion = "6.2.0" - private val scalaVersionNumber = "2.11" + private val scalaVersionMajor = "2.11" - val myAssemblySettings = Seq( + val shadeAssemblySettings = Seq( + scalaVersion := Build.scalaVersionNumber, test in assembly := {}, assemblyOption in assembly ~= { _.copy(includeScala = false) }, assemblyJarName in assembly := { - s"${name.value}-$scalaVersionNumber-${version.value}-assembly.jar" + s"${name.value}-$scalaVersionMajor-${version.value}-assembly.jar" }, - target in assembly := baseDirectory.value.getParentFile / "target" / scalaVersionNumber + target in assembly := baseDirectory.value.getParentFile / "target" / scalaVersionMajor ) val shaded = Project( @@ -49,7 +50,7 @@ object BuildShaded extends sbt.Build { lazy val shaded_akka_kryo = Project( id = "gearpump-shaded-akka-kryo", base = file("shaded/akka-kryo"), - settings = myAssemblySettings ++ + settings = shadeAssemblySettings ++ Seq( assemblyShadeRules in assembly := Seq( ShadeRule.zap("com.google.protobuf.**").inAll, @@ -74,7 +75,7 @@ object BuildShaded extends sbt.Build { lazy val shaded_gs_collections = Project( id = "gearpump-shaded-gs-collections", base = file("shaded/gs-collections"), - settings = myAssemblySettings ++ + settings = shadeAssemblySettings ++ Seq( assemblyShadeRules in assembly := Seq( ShadeRule.rename("com.gs.collections.**" -> @@ -91,7 +92,7 @@ object BuildShaded extends sbt.Build { lazy val shaded_guava = Project( id = "gearpump-shaded-guava", base = file("shaded/guava"), - settings = myAssemblySettings ++ + settings = shadeAssemblySettings ++ Seq( assemblyShadeRules in assembly := Seq( ShadeRule.rename("com.google.**" -> "org.apache.gearpump.google.@1").inAll @@ -107,7 +108,7 @@ object BuildShaded extends sbt.Build { lazy val shaded_metrics_graphite = Project( id = "gearpump-shaded-metrics-graphite", base = file("shaded/metrics-graphite"), - settings = myAssemblySettings ++ + settings = shadeAssemblySettings ++ Seq( assemblyShadeRules in assembly := Seq( ShadeRule.rename("com.codahale.metrics.**" -> @@ -122,10 +123,9 @@ object BuildShaded extends sbt.Build { ) ) - def getShadedJarFile(name: String, gearpumpVersion: String): File = { - shaded.base / "target" / scalaVersionNumber / - s"gearpump-shaded-$name-$scalaVersionNumber-$gearpumpVersion-assembly.jar" + shaded.base / "target" / scalaVersionMajor / + s"gearpump-shaded-$name-$scalaVersionMajor-$gearpumpVersion-assembly.jar" } } \ No newline at end of file
