chore: update to bazel 2.2 (bazel-contrib#1691)

.bazelci/presubmit.yml

@@ -1,5 +1,5 @@
 ---
-bazel: 2.1.1
+bazel: 2.2.0
 tasks:
   ubuntu1604:
     name: ubuntu1604

.bazelversion

@@ -1 +1 @@
-2.1.1
+2.2.0

index.bzl

@@ -93,7 +93,7 @@ VERSION = "1.4.0"
 # against.
 # This version should be updated together with the version of the Bazel
 # in .bazelversion. This is asserted in //internal:bazel_version_test.
-BAZEL_VERSION = "2.1.1"
+BAZEL_VERSION = "2.2.0"
 
 # Versions of Bazel which users should be able to use.
 # Ensures we don't break backwards-compatibility,

internal/npm_install/generate_build_file.js

@@ -438,8 +438,11 @@ def _maybe(repo_rule, name, **kwargs):
             // root of the external repository, and won't see BUILD files under node_modules
             // This parsing of the version number isn't accurate in some cases
             // (eg. install bazel from commit hash)
-            if (BAZEL_VERSION.startsWith('2.1'))
+            // Do a cheap semver check that the major version is at least 2.1
+            // (we don't want to depend on a third-party library like semver here)
+            if (Number(BAZEL_VERSION.split('.')[0]) >= 2 && !BAZEL_VERSION.startsWith('2.0')) {
                 hide = false;
+            }
             if (fs.lstatSync(f).isSymbolicLink()) {
                 hide = false;
             }

internal/npm_install/generate_build_file.ts

@@ -482,7 +482,11 @@ function findPackages(p = 'node_modules') {
     // root of the external repository, and won't see BUILD files under node_modules
     // This parsing of the version number isn't accurate in some cases
     // (eg. install bazel from commit hash)
-    if (BAZEL_VERSION.startsWith('2.1')) hide = false;
+    // Do a cheap semver check that the major version is at least 2.1
+    // (we don't want to depend on a third-party library like semver here)
+    if (Number(BAZEL_VERSION.split('.')[0]) >= 2 && !BAZEL_VERSION.startsWith('2.0')) {
+      hide = false;
+    }
     if (fs.lstatSync(f).isSymbolicLink()) {
       hide = false;
     }