Merge branch 'stable-3.1'
* stable-3.1:
Bump Bazel version to 3.0.0
Remove disabling gr-autocomplete
Change-Id: I182721f02d15267a565abf402a394aeb753cb989
diff --git a/WORKSPACE b/WORKSPACE
index db55f33..eab796e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "fc1bfdf008c4b07e7cc4214fdacf25560276f9c4",
+ commit = "cd715d269734e7bb0aa2fc4a01d2d2e279631cc7",
#local_path = "/home/<user>/projects/bazlets",
)
@@ -36,19 +36,19 @@
)
# 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/ReviewersResolverIT.java b/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersResolverIT.java
index 38f367d..afb520c 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersResolverIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/reviewers/ReviewersResolverIT.java
@@ -87,6 +87,6 @@
private TestAccount createTestAccount(String name, String group) throws Exception {
name = name(name);
- return accountCreator.create(name, name + "@example.com", name + " full name", group);
+ return accountCreator.create(name, name + "@example.com", name + " full name", null, group);
}
}