Explicitly mark tests/testdata/* as binary. (#761)
Fixes #760
Drive-by:
* update go_rules
* modernize brotli_inc
* fix wrapper build
* update PY to 3 in Travis / OSX / Bazel build
* upgrade JS Bazel rules.
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..a1665da
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+tests/testdata/* binary
diff --git a/BUILD b/BUILD
index fa8ac13..4c9b57a 100644
--- a/BUILD
+++ b/BUILD
@@ -99,7 +99,7 @@
name = "brotli_inc",
hdrs = [":public_headers"],
copts = STRICT_C_OPTIONS,
- includes = ["c/include"],
+ strip_include_prefix = "c/include",
)
cc_library(
diff --git a/go/WORKSPACE b/go/WORKSPACE
index dcb5615..e965269 100644
--- a/go/WORKSPACE
+++ b/go/WORKSPACE
@@ -9,8 +9,11 @@
http_archive(
name = "io_bazel_rules_go",
- urls = ["https://github.com/bazelbuild/rules_go/releases/download/0.17.0/rules_go-0.17.0.tar.gz"],
- sha256 = "492c3ac68ed9dcf527a07e6a1b2dcbf199c6bf8b35517951467ac32e421c06c1",
+ urls = [
+ "https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/rules_go/releases/download/0.19.0/rules_go-0.19.0.tar.gz",
+ "https://github.com/bazelbuild/rules_go/releases/download/0.19.0/rules_go-0.19.0.tar.gz",
+ ],
+ sha256 = "9fb16af4d4836c8222142e54c9efa0bb5fc562ffc893ce2abeac3e25daead144",
)
load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_toolchains")
diff --git a/java/org/brotli/wrapper/common/common_jni.cc b/java/org/brotli/wrapper/common/common_jni.cc
index 2ea2ad8..c71ca49 100644
--- a/java/org/brotli/wrapper/common/common_jni.cc
+++ b/java/org/brotli/wrapper/common/common_jni.cc
@@ -6,7 +6,7 @@
#include <jni.h>
-#include "../common/dictionary.h"
+#include "c/common/dictionary.h"
#ifdef __cplusplus
extern "C" {
diff --git a/js/WORKSPACE b/js/WORKSPACE
index dbd5384..f15740a 100644
--- a/js/WORKSPACE
+++ b/js/WORKSPACE
@@ -4,7 +4,7 @@
git_repository(
name = "io_bazel_rules_closure",
- commit = "a176ec89a1b251bb5442ba569d47cee3c053e633",
+ commit = "29ec97e7c85d607ba9e41cab3993fbb13f812c4b",
remote = "https://github.com/bazelbuild/rules_closure.git",
)
diff --git a/scripts/.travis.sh b/scripts/.travis.sh
index 367cdfa..8b7e2b3 100755
--- a/scripts/.travis.sh
+++ b/scripts/.travis.sh
@@ -18,6 +18,7 @@
case "${BUILD_SYSTEM}" in
"bazel")
brew install bazel
+ brew upgrade python
;;
esac
;;
