commit 66b1c84b01d0a6e0d9e05292eb485e8ba1ef7848
author Marco Miller <marco.miller@ericsson.com> Fri Sep 28 17:10:23 2018 -0400
committer Marco Miller <marco.miller@ericsson.com> Fri Sep 28 17:10:23 2018 -0400
tree 3470f7bef621272c641f28b2df91bb637f72f5bc
parent 6129cc86205b70754f8b2944253ecb4abbba71d1
parent bb00566f46cc955099db4b819245f41882aedc0d

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  HeartbeatConfigTest: Update file's google-java-format
  Format all Bazel build files with buildifier
  Update bazlets to latest stable-2.14 to build with 2.14.14 API
  Migrate `tools/bazel.rc` to `.bazelrc`
  Update bazlets to latest stable-2.14 to build with 2.14.13 API
  Update bazlets to latest stable-2.14 to use 2.14.12 API

Change-Id: I7568315a8e936ef9d4b0e68ff35f150805778cd1

.bazelrc

diff --git a/tools/bazel.rc b/.bazelrc
similarity index 100%
rename from tools/bazel.rc
rename to .bazelrc

BUILD

diff --git a/BUILD b/BUILD
index de233a2..5655497 100644
--- a/BUILD
+++ b/BUILD
@@ -1,9 +1,9 @@
 load("//tools/bzl:junit.bzl", "junit_tests")
 load(
     "//tools/bzl:plugin.bzl",
-    "gerrit_plugin",
     "PLUGIN_DEPS",
     "PLUGIN_TEST_DEPS",
+    "gerrit_plugin",
 )
 
 gerrit_plugin(

bazlets.bzl

diff --git a/bazlets.bzl b/bazlets.bzl
index e14e488..f97b72c 100644
--- a/bazlets.bzl
+++ b/bazlets.bzl
@@ -1,17 +1,16 @@
 NAME = "com_googlesource_gerrit_bazlets"
 
 def load_bazlets(
-    commit,
-    local_path = None
-  ):
-  if not local_path:
-      native.git_repository(
-          name = NAME,
-          remote = "https://gerrit.googlesource.com/bazlets",
-          commit = commit,
-      )
-  else:
-      native.local_repository(
-          name = NAME,
-          path = local_path,
-      )
+        commit,
+        local_path = None):
+    if not local_path:
+        native.git_repository(
+            name = NAME,
+            remote = "https://gerrit.googlesource.com/bazlets",
+            commit = commit,
+        )
+    else:
+        native.local_repository(
+            name = NAME,
+            path = local_path,
+        )

src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatConfigTest.java

diff --git a/src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatConfigTest.java b/src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatConfigTest.java
index a656de1..08821a7 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatConfigTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/heartbeat/HeartbeatConfigTest.java
@@ -85,7 +85,7 @@
 
   private void deleteFolder(File folder) {
     File[] files = folder.listFiles();
-    if (files != null) { //some JVMs return null for empty dirs
+    if (files != null) { // some JVMs return null for empty dirs
       for (File f : files) {
         if (f.isDirectory()) {
           deleteFolder(f);

tools/bzl/classpath.bzl

diff --git a/tools/bzl/classpath.bzl b/tools/bzl/classpath.bzl
index dfcbe9c..d5764f7 100644
--- a/tools/bzl/classpath.bzl
+++ b/tools/bzl/classpath.bzl
@@ -1,2 +1,4 @@
-load("@com_googlesource_gerrit_bazlets//tools:classpath.bzl",
-     "classpath_collector")
+load(
+    "@com_googlesource_gerrit_bazlets//tools:classpath.bzl",
+    "classpath_collector",
+)

tools/bzl/plugin.bzl

diff --git a/tools/bzl/plugin.bzl b/tools/bzl/plugin.bzl
index a2e438f..0b25d23 100644
--- a/tools/bzl/plugin.bzl
+++ b/tools/bzl/plugin.bzl
@@ -1,6 +1,6 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
     "PLUGIN_DEPS",
     "PLUGIN_TEST_DEPS",
+    "gerrit_plugin",
 )