Merge pull request #260 from ruuda/bazel025

Fix build for Bazel 0.25 and later
google · Oct 25, 2019 · 214f2bb · 214f2bb
2 parents 0b78c7c + d5545ad
commit 214f2bb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.travis.sh b/.travis.sh
@@ -15,11 +15,12 @@ case "$1" in
 		case "${TRAVIS_OS_NAME}" in
 		    "linux")
 			sudo apt-get remove openjdk-9-jdk oracle-java9-installer # Conflicts with Bazel.
-			wget https://github.com/bazelbuild/bazel/releases/download/0.4.5/bazel_0.4.5-linux-x86_64.deb
-			echo 'b494d0a413e4703b6cd5312403bea4d92246d6425b3be68c9bfbeb8cc4db8a55  bazel_0.4.5-linux-x86_64.deb' | sha256sum -c --strict || exit 1
-			sudo dpkg -i bazel_0.4.5-linux-x86_64.deb
+			wget https://github.com/bazelbuild/bazel/releases/download/1.1.0/bazel_1.1.0-linux-x86_64.deb
+			echo '138b47ffd54924e3c0264c65d31d3927803fb9025db4d5b18107df79ee3bda95  bazel_1.1.0-linux-x86_64.deb' | sha256sum -c --strict || exit 1
+			sudo dpkg -i bazel_1.1.0-linux-x86_64.deb
 			;;
 		    "osx")
+			brew cask install homebrew/cask-versions/adoptopenjdk8
 			brew install bazel
 			;;
 		esac

diff --git a/WORKSPACE b/WORKSPACE
@@ -3,15 +3,17 @@
 
 workspace(name = "guetzli")
 
-new_http_archive(
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
     name = "png_archive",
     build_file = "png.BUILD",
     sha256 = "a941dc09ca00148fe7aaf4ecdd6a67579c293678ed1e1cf633b5ffc02f4f8cf7",
     strip_prefix = "libpng-1.2.57",
     url = "http://github.com/glennrp/libpng/archive/v1.2.57.zip",
 )
 
-new_http_archive(
+http_archive(
     name = "zlib_archive",
     build_file = "zlib.BUILD",
     sha256 = "8d7e9f698ce48787b6e1c67e6bff79e487303e66077e25cb9784ac8835978017",

diff --git a/png.BUILD → external/png.BUILD b/png.BUILD → external/png.BUILD
diff --git a/zlib.BUILD → external/zlib.BUILD b/zlib.BUILD → external/zlib.BUILD