buildable with bazel 0.8 (#319)

* buildable with bazel 0.8 * Increase resource
cloudendpoints · Feb 2, 2018 · 7471e72 · 7471e72
1 parent 2df1fec
commit 7471e72
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 18 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -106,17 +106,6 @@ grpc_repositories()
 
 transcoding_repositories()
 
-# Workaround for Bazel > 0.4.0 since it needs newer protobuf.bzl from:
-# https://github.com/google/protobuf/pull/2246
-# Do not use this git_repository for anything else than protobuf.bzl
-new_git_repository(
-    name = "protobuf_bzl",
-    # Injecting an empty BUILD file to prevent using any build target
-    build_file_content = "",
-    commit = "05090726144b6e632c50f47720ff51049bfcbef6",
-    remote = "https://github.com/google/protobuf.git",
-)
-
 git_repository(
     name = "gflags_git",
     commit = "fe57e5af4db74ab298523f06d2c43aa895ba9f98",  # 2016-07-22
@@ -139,7 +128,7 @@ git_repository(
 #
 git_repository(
     name = "io_bazel_rules_pex",
-    commit = "d4af3ca0a015e8b2d2a81a4df1df51bb0fa0bba0",
+    commit = "6af30588d4f11cafcb744c50935cc37f029e6e7f",
     remote = "https://github.com/benley/bazel_rules_pex.git",
 )
 
@@ -153,7 +142,7 @@ pex_repositories()
 
 git_repository(
     name = "io_bazel_rules_perl",
-    commit = "f6211c2db1e54d0a30bc3c3a718f2b5d45f02a22",
+    commit = "5510c0ee04152aed9c5d1aba3ddb01daab336ad5",
     remote = "https://github.com/bazelbuild/rules_perl.git",
 )
 

diff --git a/nginx.bzl b/nginx.bzl
@@ -34,7 +34,8 @@ def nginx_test(name, nginx, data=None, env=None, config=None, **kwargs):
 
   if data == None:
     data = []
-  data += [ nginx ]
+  if nginx not in data:
+    data += [ nginx ]
 
   if env == None:
     env = {}

diff --git a/src/nginx/BUILD b/src/nginx/BUILD
@@ -24,7 +24,7 @@
 #
 ###############################################################################
 #
-load("@protobuf_bzl//:protobuf.bzl", "cc_proto_library")
+load("@protobuf_git//:protobuf.bzl", "cc_proto_library")
 
 exports_files(["version"])
 

diff --git a/test/grpc/BUILD b/test/grpc/BUILD
@@ -29,7 +29,7 @@ package(default_visibility = [
     "//src/nginx/t:__pkg__",
 ])
 
-load("@protobuf_bzl//:protobuf.bzl", "cc_proto_library")
+load("@protobuf_git//:protobuf.bzl", "cc_proto_library")
 
 cc_proto_library(
     name = "grpc-test_proto",

diff --git a/test/transcoding/BUILD b/test/transcoding/BUILD
@@ -28,7 +28,7 @@ package(default_visibility = [
     "//src/nginx/t:__pkg__",
 ])
 
-load("@protobuf_bzl//:protobuf.bzl", "cc_proto_library")
+load("@protobuf_git//:protobuf.bzl", "cc_proto_library")
 
 cc_proto_library(
     name = "bookstore",

diff --git a/third_party/BUILD.googleapis b/third_party/BUILD.googleapis
@@ -1,6 +1,6 @@
 licenses(["notice"])
 
-load("@protobuf_bzl//:protobuf.bzl", "cc_proto_library")
+load("@protobuf_git//:protobuf.bzl", "cc_proto_library")
 
 exports_files(glob(["google/**"]))