Merge branch 'stable-2.15'
* stable-2.15:
Bump sbt to 1.2.3
Bump Gerrit API version to 2.15.3
Align Gerrit API version to 2.14.12
Upgrade sbt plugins
Change-Id: If0c6d97d076ce2261ffffafd3cd0e17db89e21e8
diff --git a/build.sbt b/build.sbt
index fe1e822..9082863 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,6 +1,7 @@
enablePlugins(GitVersioning)
-val gerritApiVersion = "2.13.7"
+val gerritApiVersion = "2.15.3"
+
val pluginName = "analytics"
git.useGitDescribe := true
@@ -9,15 +10,18 @@
.settings(
name := pluginName,
+ version := "2.14-SNAPSHOT",
+
scalaVersion := "2.11.8",
libraryDependencies ++= Seq(
"io.fabric8" % "gitective-core" % "0.9.37"
- exclude("org.eclipse.jgit", "org.eclipse.jgit"),
- "com.google.inject" % "guice" % "3.0" % Provided,
+ exclude ("org.eclipse.jgit", "org.eclipse.jgit"),
+
+ "com.google.inject" % "guice" % "4.2.0" % Provided,
"com.google.gerrit" % "gerrit-plugin-api" % gerritApiVersion % Provided withSources(),
- "com.google.code.gson" % "gson" % "2.7" % Provided,
- "joda-time" % "joda-time" % "2.9.4" % Provided,
+ "com.google.code.gson" % "gson" % "2.8.0" % Provided,
+ "joda-time" % "joda-time" % "2.9.9" % Provided,
"org.scalatest" %% "scalatest" % "3.0.1" % Test,
"net.codingwell" %% "scala-guice" % "4.1.0" % Test),
diff --git a/project/build.properties b/project/build.properties
index 64317fd..0cd8b07 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.15
+sbt.version=1.2.3
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 734a503..30fcaf9 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,5 +1,5 @@
logLevel := Level.Warn
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.4")
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.1.0")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.7")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.9.3")
