Merge branch 'stable-3.0'
* stable-3.0:
Make transitive starlark loads explicit
Make transitive starlark loads explicit
Make transitive starlark loads explicit
Make transitive starlark loads explicit
Upgrade bazlets to latest master to build with 3.0.0 API
Upgrade bazlets to latest master to build with 3.0.0-rc3 API
Change-Id: Ic46f7b9704e90984283d7c55950cc564fece5e0e
diff --git a/WORKSPACE b/WORKSPACE
index d359367..241b6b6 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,24 +3,24 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "51049da0140c58ee26f8285bca4393c5e43ce4a1",
+ commit = "d826d85285bb22d3fe817fe165a7e1d3472f65fa",
#local_path = "/home/<user>/projects/bazlets",
)
# Release Plugin API
-load(
- "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
- "gerrit_api",
-)
-
-# Snapshot Plugin API
#load(
-# "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-# "gerrit_api_maven_local",
+# "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
+# "gerrit_api",
#)
+# Snapshot Plugin API
+load(
+ "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
+ "gerrit_api_maven_local",
+)
+
# Load release Plugin API
-gerrit_api()
+#gerrit_api()
# Load snapshot Plugin API
-#gerrit_api_maven_local()
+gerrit_api_maven_local()
diff --git a/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersIT.java b/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersIT.java
index fdc7fe4..74d5c07 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersIT.java
@@ -30,7 +30,7 @@
import com.google.gerrit.acceptance.TestAccount;
import com.google.gerrit.acceptance.TestPlugin;
import com.google.gerrit.extensions.common.AccountInfo;
-import com.google.gerrit.reviewdb.client.Branch;
+import com.google.gerrit.reviewdb.client.BranchNameKey;
import com.google.gerrit.reviewdb.client.RefNames;
import java.util.Collection;
import org.eclipse.jgit.lib.Config;
@@ -135,7 +135,7 @@
testRepo.reset(oldHead);
- createBranch(Branch.nameKey(project, "other-branch"));
+ createBranch(BranchNameKey.create(project, "other-branch"));
// Create a change that matches the filter section.
createChange("refs/for/master");
@@ -168,7 +168,7 @@
testRepo.reset(oldHead);
- createBranch(Branch.nameKey(project, "other-branch"));
+ createBranch(BranchNameKey.create(project, "other-branch"));
// Create a change that doesn't match the filter section.
createChange("refs/for/master");
