Adapt to gerrit v3.1-rc1 Replace com.google.gerrit.reviewdb.client.Project imports with com.google.gerrit.entities.Project Feature: Issue 11807 Change-Id: Ic37c7784fb62462a17618d61531e93d0d2033719
diff --git a/build.sbt b/build.sbt index ba0d2a5..24ddfd2 100644 --- a/build.sbt +++ b/build.sbt
@@ -1,6 +1,6 @@ enablePlugins(GitVersioning) -val gerritApiVersion = "3.1.0-SNAPSHOT" +val gerritApiVersion = "3.1.0-rc1" val pluginName = "analytics"
diff --git a/src/main/scala/com/googlesource/gerrit/plugins/analytics/common/CommitsStatistics.scala b/src/main/scala/com/googlesource/gerrit/plugins/analytics/common/CommitsStatistics.scala index 685fc59..c13f17a 100644 --- a/src/main/scala/com/googlesource/gerrit/plugins/analytics/common/CommitsStatistics.scala +++ b/src/main/scala/com/googlesource/gerrit/plugins/analytics/common/CommitsStatistics.scala
@@ -14,7 +14,7 @@ package com.googlesource.gerrit.plugins.analytics.common -import com.google.gerrit.reviewdb.client.Project +import com.google.gerrit.entities.Project import com.googlesource.gerrit.plugins.analytics.{CommitInfo, IssueInfo} import org.eclipse.jgit.lib.ObjectId
diff --git a/src/main/scala/com/googlesource/gerrit/plugins/analytics/common/CommitsStatisticsLoader.scala b/src/main/scala/com/googlesource/gerrit/plugins/analytics/common/CommitsStatisticsLoader.scala index 98d591d..4e8a43e 100644 --- a/src/main/scala/com/googlesource/gerrit/plugins/analytics/common/CommitsStatisticsLoader.scala +++ b/src/main/scala/com/googlesource/gerrit/plugins/analytics/common/CommitsStatisticsLoader.scala
@@ -15,8 +15,8 @@ package com.googlesource.gerrit.plugins.analytics.common import com.google.common.cache.CacheLoader +import com.google.gerrit.entities.Project import com.google.gerrit.extensions.api.projects.CommentLinkInfo -import com.google.gerrit.reviewdb.client.Project import com.google.gerrit.server.git.GitRepositoryManager import com.google.gerrit.server.project.ProjectCache import com.google.inject.Inject
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/analytics/test/CommitStatisticsCommentLinkSpec.scala b/src/test/scala/com/googlesource/gerrit/plugins/analytics/test/CommitStatisticsCommentLinkSpec.scala index 5f1fe84..d7f37f3 100644 --- a/src/test/scala/com/googlesource/gerrit/plugins/analytics/test/CommitStatisticsCommentLinkSpec.scala +++ b/src/test/scala/com/googlesource/gerrit/plugins/analytics/test/CommitStatisticsCommentLinkSpec.scala
@@ -16,7 +16,6 @@ import com.google.gerrit.acceptance.UseLocalDisk import com.google.gerrit.extensions.api.projects.CommentLinkInfo -import com.google.gerrit.reviewdb.client.Project import com.google.gerrit.server.git.GitRepositoryManager import com.googlesource.gerrit.plugins.analytics.IssueInfo import com.googlesource.gerrit.plugins.analytics.common.{CommitsStatistics, Statistics}
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/analytics/test/GerritTestDaemon.scala b/src/test/scala/com/googlesource/gerrit/plugins/analytics/test/GerritTestDaemon.scala index 1b6b674..c1d0409 100644 --- a/src/test/scala/com/googlesource/gerrit/plugins/analytics/test/GerritTestDaemon.scala +++ b/src/test/scala/com/googlesource/gerrit/plugins/analytics/test/GerritTestDaemon.scala
@@ -18,11 +18,11 @@ import java.util.{Date, UUID} import com.google.gerrit.acceptance.{AbstractDaemonTest, GitUtil} +import com.google.gerrit.entities.Project import com.google.gerrit.extensions.annotations.PluginName import com.google.gerrit.extensions.client.SubmitType import com.google.gerrit.acceptance._ import com.google.gerrit.extensions.restapi.RestApiModule -import com.google.gerrit.reviewdb.client.Project import com.google.gerrit.server.project.ProjectResource.PROJECT_KIND import com.google.inject.AbstractModule import com.googlesource.gerrit.plugins.analytics.{AnalyticsConfig, ContributorsResource}