From 02f0dca8d4218b2ed9e8091e9335644cf8b433f9 Mon Sep 17 00:00:00 2001
From: Kun Zhang <zhangkun83@users.noreply.github.com>
Date: Wed, 14 Nov 2018 07:12:11 -0800
Subject: [PATCH] Fix buildifier warnings (#5058)

---
 alts/BUILD.bazel    |  2 +-
 auth/BUILD.bazel    |  2 +-
 grpclb/BUILD.bazel  | 10 +++++-----
 repositories.bzl    |  2 +-
 testing/BUILD.bazel |  3 +--
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/alts/BUILD.bazel b/alts/BUILD.bazel
index 7fc41a711c..8924d7f1cc 100644
--- a/alts/BUILD.bazel
+++ b/alts/BUILD.bazel
@@ -35,9 +35,9 @@ java_library(
     deps = [
         ":alts_internal",
         ":handshaker_java_grpc",
+        "//auth",
         "//core",
         "//core:internal",
-        "//auth",
         "//netty",
         "@com_google_auth_google_auth_library_oauth2_http//jar",
         "@com_google_code_findbugs_jsr305//jar",
diff --git a/auth/BUILD.bazel b/auth/BUILD.bazel
index 7f78ce84c8..b6ad6e7063 100644
--- a/auth/BUILD.bazel
+++ b/auth/BUILD.bazel
@@ -7,8 +7,8 @@ java_library(
     deps = [
         "//core",
         "@com_google_auth_google_auth_library_credentials//jar",
+        "@com_google_code_findbugs_jsr305//jar",
         "@com_google_guava_guava//jar",
         "@com_google_j2objc_j2objc_annotations//jar",
-        "@com_google_code_findbugs_jsr305//jar",
     ],
 )
diff --git a/grpclb/BUILD.bazel b/grpclb/BUILD.bazel
index 87d32cb152..c557866274 100644
--- a/grpclb/BUILD.bazel
+++ b/grpclb/BUILD.bazel
@@ -7,16 +7,16 @@ java_library(
     ]),
     visibility = ["//visibility:public"],
     deps = [
+        ":load_balancer_java_grpc",
+        ":load_balancer_java_proto",
         "//core",
         "//core:internal",
         "//core:util",
         "//stub",
-        "@com_google_protobuf//:protobuf_java_util",
+        "@com_google_code_findbugs_jsr305//jar",
         "@com_google_guava_guava//jar",
         "@com_google_j2objc_j2objc_annotations//jar",
-        "@com_google_code_findbugs_jsr305//jar",
-        ":load_balancer_java_proto",
-        ":load_balancer_java_grpc",
+        "@com_google_protobuf//:protobuf_java_util",
     ],
 )
 
@@ -24,8 +24,8 @@ proto_library(
     name = "load_balancer_proto",
     srcs = ["src/main/proto/grpc/lb/v1/load_balancer.proto"],
     deps = [
-        "@com_google_protobuf//:timestamp_proto",
         "@com_google_protobuf//:duration_proto",
+        "@com_google_protobuf//:timestamp_proto",
     ],
 )
 
diff --git a/repositories.bzl b/repositories.bzl
index 0895156b91..71572877df 100644
--- a/repositories.bzl
+++ b/repositories.bzl
@@ -163,7 +163,7 @@ def com_google_guava():
 def com_google_j2objc_j2objc_annotations():
     native.maven_jar(
         name = "com_google_j2objc_j2objc_annotations",
-	artifact = "com.google.j2objc:j2objc-annotations:1.1",
+        artifact = "com.google.j2objc:j2objc-annotations:1.1",
         sha1 = "ed28ded51a8b1c6b112568def5f4b455e6809019",
     )
 
diff --git a/testing/BUILD.bazel b/testing/BUILD.bazel
index 69ef7c6c68..f09ffd03f8 100644
--- a/testing/BUILD.bazel
+++ b/testing/BUILD.bazel
@@ -1,5 +1,6 @@
 java_library(
     name = "testing",
+    testonly = 1,
     srcs = glob([
         "src/main/java/io/grpc/testing/*.java",
     ]),
@@ -13,14 +14,12 @@ java_library(
         "//core:inprocess",
         "//core:util",
         "//stub",
-
         "@com_google_code_findbugs_jsr305//jar",
         "@com_google_guava_guava//jar",
         "@com_google_j2objc_j2objc_annotations//jar",
         "@com_google_truth_truth//jar",
         "@junit_junit//jar",
     ],
-    testonly = 1,
 )
 
 java_library(