Skip to content

Commit

Permalink
Update minimum bazel and java versions on Mac
Browse files Browse the repository at this point in the history
  • Loading branch information
Jamie Snape committed Aug 23, 2018
1 parent 6001128 commit fd104e0
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ endif()

# The version passed to find_package(Bazel) should match the
# minimum_bazel_version value in the call to versions.check() in WORKSPACE.
set(MINIMUM_BAZEL_VERSION 0.15.2)
set(MINIMUM_BAZEL_VERSION 0.16.1)
find_package(Bazel ${MINIMUM_BAZEL_VERSION} MODULE REQUIRED)

get_filename_component(C_COMPILER_REALPATH "${CMAKE_C_COMPILER}" REALPATH)
Expand Down
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ load("@bazel_skylib//:lib.bzl", "versions")
# This needs to be in WORKSPACE or a repository rule for native.bazel_version
# to actually be defined. The minimum_bazel_version value should match the
# version passed to the find_package(Bazel) call in the root CMakeLists.txt.
versions.check(minimum_bazel_version = "0.15.2")
versions.check(minimum_bazel_version = "0.16.1")
2 changes: 1 addition & 1 deletion doc/developers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ supported for CMake builds using the "Unix Makefiles" generator.
| Ubuntu 16.04 LTS ("Xenial") | | Bazel 0.16.1 | | Clang 4.0 | OpenJDK 8 | R2017a | 2.7.11 |
| | | CMake 3.5.1 | | GCC 5.4 | | | |
+-----------------------------+-----------------+--------------------+------------+ +--------+
| macOS 10.12 ("Sierra") | | Bazel 0.15.2 | Apple Clang 9.0.0 | Oracle 1.8 | | 2.7.15 |
| macOS 10.12 ("Sierra") | | Bazel 0.16.1 | Apple Clang 9.0.0 | Oracle 10 | | 2.7.15 |
+-----------------------------+ | CMake 3.12.1 | | +-------------------+ |
| macOS 10.13 ("High Sierra") | | | | R2017b | |
+-----------------------------+-----------------+--------------------+------------+-------------------+--------+
Expand Down
3 changes: 1 addition & 2 deletions setup/mac/binary_distribution/Brewfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :

tap 'caskroom/versions'
tap 'dreal/dreal'
tap 'robotlocomotion/director'

Expand All @@ -25,6 +24,6 @@ brew 'tinyxml2'
brew '[email protected]'
brew 'yaml-cpp'

cask 'java8' unless system '/usr/libexec/java_home --version 1.8 --failfast &> /dev/null'
cask 'java' unless system '/usr/libexec/java_home --version 1.8+ --failfast &> /dev/null'

mas 'Xcode', id: 497799835 unless File.exist? '/Applications/Xcode.app'
3 changes: 2 additions & 1 deletion setup/mac/source_distribution/Brewfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :

tap 'bazelbuild/tap'
tap 'robotlocomotion/director'

brew 'bash-completion'
brew 'bazel'
brew 'bazelbuild/tap/bazel'
brew 'clang-format'
brew 'diffstat'
brew 'doxygen'
Expand Down
3 changes: 3 additions & 0 deletions setup/mac/source_distribution/install_prereqs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ if [[ "${EUID}" -eq 0 ]]; then
fi

/usr/local/bin/brew update
# TODO(jamiesnape): Remove this line on or after 9/30/18.
/usr/local/bin/brew uninstall --force bazel
/usr/local/bin/brew bundle --file="${BASH_SOURCE%/*}/Brewfile"
/usr/local/bin/brew tap-pin bazelbuild/tap

/usr/local/bin/pip2 install --upgrade --requirement "${BASH_SOURCE%/*}/requirements.txt"

0 comments on commit fd104e0

Please sign in to comment.