Update to Bazel v2.1.0

.bazelversion

@@ -1 +1 @@
-1.2.1
+2.1.0

.travis.yml

@@ -8,7 +8,7 @@ os:
   - osx
 
 env:
-  - V=1.2.1
+  - V=2.1.0
 
 before_install:
   - OS=linux

3rdparty/dependencies.yaml

@@ -25,7 +25,7 @@ options:
 github:
   io_bazel:
     repo: bazelbuild/bazel
-    tag: 1.2.1
+    tag: 2.1.0
   io_bazel_buildtools:
     repo: bazelbuild/buildtools
     commit: 77355e5628b4bfffa932bc8645ea165d9f5c486d

3rdparty/repositories.bzl

@@ -44,9 +44,9 @@ def repositories(github_callback = None):
     _frozen_repos()
     if github_callback == None:
         github_callback = default_github_callback
-    github_callback(name = "io_bazel", repository = "bazelbuild/bazel", tag = "1.2.1")
     github_callback(name = "io_bazel_buildtools", repository = "bazelbuild/buildtools", commit = "77355e5628b4bfffa932bc8645ea165d9f5c486d")
     github_callback(name = "io_bazel_rules_go", repository = "bazelbuild/rules_go", commit = "a667c18bef6ec5a11f1cbf40b219d541c48e942e")
     github_callback(name = "io_bazel_rules_scala", repository = "bazelbuild/rules_scala", commit = "6c16cff213b76a4126bdc850956046da5db1daaa")
+    github_callback(name = "io_bazel", repository = "bazelbuild/bazel", tag = "2.1.0")
     github_callback(name = "rules_python", repository = "bazelbuild/rules_python", commit = "94677401bc56ed5d756f50b441a6a5c7f735a6d4")
     github_callback(name = "rules_jvm_external", repository = "bazelbuild/rules_jvm_external", tag = "3.0")

3rdparty/resolved.bzl

@@ -81,11 +81,11 @@ resolved = [
     },
     {
         "original_rule_class": "@bazel_tools//tools/build_defs/repo:git.bzl%git_repository",
-        "definition_information": "Call stack for the definition of repository 'io_bazel' which is a git_repository (rule definition at /private/var/tmp/_bazel_dlervik/eb5cb7802fa2a138cca2f4fc93f2b5fb/external/bazel_tools/tools/build_defs/repo/git.bzl:195:18):\n - /Users/dlervik/src/bazel-tools/3rdparty/repositories.bzl:30:9\n - /Users/dlervik/src/bazel-tools/3rdparty/repositories.bzl:18:9\n - /Users/dlervik/src/bazel-tools/3rdparty/repositories.bzl:47:5\n - /Users/dlervik/src/bazel-tools/WORKSPACE:18:1",
+        "definition_information": "Call stack for the definition of repository 'io_bazel' which is a git_repository (rule definition at /private/var/tmp/_bazel_smandrean/94181bd310b9c3bf8fc0403fe06b6f7c/external/bazel_tools/tools/build_defs/repo/git.bzl:195:18):\n - /Users/smandrean/src/github.com/spotify/bazel-tools/3rdparty/repositories.bzl:30:9\n - /Users/smandrean/src/github.com/spotify/bazel-tools/3rdparty/repositories.bzl:30:9\n - /Users/smandrean/src/github.com/spotify/bazel-tools/3rdparty/repositories.bzl:18:9\n - /Users/smandrean/src/github.com/spotify/bazel-tools/3rdparty/repositories.bzl:47:5\n - /Users/smandrean/src/github.com/spotify/bazel-tools/WORKSPACE:18:1",
         "original_attributes": {
             "name": "io_bazel",
             "remote": "https://github.com/bazelbuild/bazel.git",
-            "tag": "1.2.1"
+            "tag": "2.1.0"
         },
         "repositories": [
             {

README.md

@@ -156,12 +156,12 @@ github:
     # The git branch
     branch: master
     # The git tag
-    tag: 1.2.1
+    tag: 2.1.0
 
     # The release artifact name (has to be used together with a tag)
-    release: bazel-1.2.1-dist.zip
+    release: bazel-2.1.0-dist.zip
     # Any top level directory to strip out after extracting the release
-    #stripPrefix: bazel-1.2.1-dist
+    #stripPrefix: bazel-2.1.0-dist
 
 # Dependencies to be fetched from Maven repositories
 maven:

tools/bazel.rc

@@ -1,2 +1 @@
 build --proto_toolchain_for_java=//:protobuf_java_toolchain
-build --incompatible_string_join_requires_strings=false