Update to Bazel v2.1.0 (#745)

* Upgrade Bazel version in Cirrus to 2.1.0 * Update jflex() bazel rule to v8 This is needed as v7 was using the deprecated native.maven_jar See jflex-de/bazel_rules#21
jflex-de · Mar 16, 2020 · 4f0df0d · 4f0df0d
1 parent 1e4a7da
commit 4f0df0d
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 29 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -5,7 +5,7 @@ buildtools_cache:
   folder: buildtools
 
 container:
-  image: l.gcr.io/google/bazel:1.2.1
+  image: l.gcr.io/google/bazel:2.1.0
   memory: 5G
 
 bazel_build__test_task:
@@ -38,11 +38,6 @@ bazel_artifact_task:
 
 measure_coverage_task:
   name: Measure code coverage
-  container:
-    image: l.gcr.io/google/bazel:1.1.0
-    memory: 6G
-  # Bazel fails to build combined report on Cirrus-ci.
-  # https://github.com/bazelbuild/bazel/issues/6450
   measure_coverage_script:
   - bazel --bazelrc=.ci.bazelrc coverage --combined_report=none --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST  //javatests/... //jflex/...
   send_coverage_report_script:

diff --git a/WORKSPACE b/WORKSPACE
@@ -10,13 +10,11 @@ RULES_JVM_EXTERNAL_SHA = "1bbf2e48d07686707dd85357e9a94da775e1dbd7c464272b366428
 
 git_repository(
     name = "jflex_rules",
-    commit = "49122dbb4b325af63af714b3006541f156b70c57",
+    commit = "a50b452bafc7e3b1f8e1780c12fc8c1ab0d6e381",  # v8
     remote = "https://github.com/jflex-de/bazel_rules.git",
 )
 
-load("@jflex_rules//jflex:deps.bzl", "jflex_deps")
-
-jflex_deps()
+load("@jflex_rules//jflex:deps.bzl", "JFLEX_ARTIFACTS")
 
 # pandoc used to build the documentation
 
@@ -55,7 +53,7 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
 
 maven_install(
     name = "maven",
-    artifacts = ARTIFACTS,
+    artifacts = ARTIFACTS + JFLEX_ARTIFACTS,
     maven_install_json = "//third_party:maven_install.json",
     repositories = [
         "https://jcenter.bintray.com/",

diff --git a/third_party/maven_install.json b/third_party/maven_install.json
@@ -1,7 +1,9 @@
 {
     "dependency_tree": {
-        "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -1473367248,
-        "conflict_resolution": {},
+        "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": 1854053551,
+        "conflict_resolution": {
+            "org.apache.ant:ant:1.7.0": "org.apache.ant:ant:1.9.7"
+        },
         "dependencies": [
             {
                 "coord": "com.github.vbmacher:java-cup-runtime:11b-20160615",
@@ -262,6 +264,39 @@
                 "sha256": "2c73b940c91250bc98346926270f13a6a10bb6e29d2c9316a70d134e382c873e",
                 "url": "https://jcenter.bintray.com/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"
             },
+            {
+                "coord": "de.jflex:cup_runtime:11b",
+                "dependencies": [],
+                "directDependencies": [],
+                "file": "v1/https/jcenter.bintray.com/de/jflex/cup_runtime/11b/cup_runtime-11b.jar",
+                "mirror_urls": [
+                    "https://jcenter.bintray.com/de/jflex/cup_runtime/11b/cup_runtime-11b.jar",
+                    "https://maven.google.comde/jflex/cup_runtime/11b/cup_runtime-11b.jar",
+                    "https://repo1.maven.org/maven2de/jflex/cup_runtime/11b/cup_runtime-11b.jar"
+                ],
+                "sha256": "9c0b5c93fe0c0e239d5f92affb672cb7c45122c3e3de8cda9513fa8e39dbbc3c",
+                "url": "https://jcenter.bintray.com/de/jflex/cup_runtime/11b/cup_runtime-11b.jar"
+            },
+            {
+                "coord": "de.jflex:jflex:1.7.0",
+                "dependencies": [
+                    "de.jflex:cup_runtime:11b",
+                    "org.apache.ant:ant:1.9.7",
+                    "org.apache.ant:ant-launcher:1.9.7"
+                ],
+                "directDependencies": [
+                    "de.jflex:cup_runtime:11b",
+                    "org.apache.ant:ant:1.9.7"
+                ],
+                "file": "v1/https/jcenter.bintray.com/de/jflex/jflex/1.7.0/jflex-1.7.0.jar",
+                "mirror_urls": [
+                    "https://jcenter.bintray.com/de/jflex/jflex/1.7.0/jflex-1.7.0.jar",
+                    "https://maven.google.comde/jflex/jflex/1.7.0/jflex-1.7.0.jar",
+                    "https://repo1.maven.org/maven2de/jflex/jflex/1.7.0/jflex-1.7.0.jar"
+                ],
+                "sha256": "c40e64600f7d29e1618a1c1d5cd697c926ff8495e166ea9416cae19644e37ae6",
+                "url": "https://jcenter.bintray.com/de/jflex/jflex/1.7.0/jflex-1.7.0.jar"
+            },
             {
                 "coord": "junit:junit:4.12",
                 "dependencies": [
@@ -313,34 +348,34 @@
                 "url": "https://jcenter.bintray.com/org/antlr/antlr-runtime/3.1.2/antlr-runtime-3.1.2.jar"
             },
             {
-                "coord": "org.apache.ant:ant-launcher:1.7.0",
+                "coord": "org.apache.ant:ant-launcher:1.9.7",
                 "dependencies": [],
                 "directDependencies": [],
-                "file": "v1/https/jcenter.bintray.com/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar",
+                "file": "v1/https/jcenter.bintray.com/org/apache/ant/ant-launcher/1.9.7/ant-launcher-1.9.7.jar",
                 "mirror_urls": [
-                    "https://jcenter.bintray.com/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar",
-                    "https://maven.google.comorg/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar",
-                    "https://repo1.maven.org/maven2org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"
+                    "https://jcenter.bintray.com/org/apache/ant/ant-launcher/1.9.7/ant-launcher-1.9.7.jar",
+                    "https://maven.google.comorg/apache/ant/ant-launcher/1.9.7/ant-launcher-1.9.7.jar",
+                    "https://repo1.maven.org/maven2org/apache/ant/ant-launcher/1.9.7/ant-launcher-1.9.7.jar"
                 ],
-                "sha256": "72b3d03e0d7d86a56513ec38dd4cd6abe3da6620189be222ab255352cb6eba4a",
-                "url": "https://jcenter.bintray.com/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"
+                "sha256": "bc376f6d6cb586229f451ac459faf1443b144c26d6647618ec9cba60e54c2b79",
+                "url": "https://jcenter.bintray.com/org/apache/ant/ant-launcher/1.9.7/ant-launcher-1.9.7.jar"
             },
             {
-                "coord": "org.apache.ant:ant:1.7.0",
+                "coord": "org.apache.ant:ant:1.9.7",
                 "dependencies": [
-                    "org.apache.ant:ant-launcher:1.7.0"
+                    "org.apache.ant:ant-launcher:1.9.7"
                 ],
                 "directDependencies": [
-                    "org.apache.ant:ant-launcher:1.7.0"
+                    "org.apache.ant:ant-launcher:1.9.7"
                 ],
-                "file": "v1/https/jcenter.bintray.com/org/apache/ant/ant/1.7.0/ant-1.7.0.jar",
+                "file": "v1/https/jcenter.bintray.com/org/apache/ant/ant/1.9.7/ant-1.9.7.jar",
                 "mirror_urls": [
-                    "https://jcenter.bintray.com/org/apache/ant/ant/1.7.0/ant-1.7.0.jar",
-                    "https://maven.google.comorg/apache/ant/ant/1.7.0/ant-1.7.0.jar",
-                    "https://repo1.maven.org/maven2org/apache/ant/ant/1.7.0/ant-1.7.0.jar"
+                    "https://jcenter.bintray.com/org/apache/ant/ant/1.9.7/ant-1.9.7.jar",
+                    "https://maven.google.comorg/apache/ant/ant/1.9.7/ant-1.9.7.jar",
+                    "https://repo1.maven.org/maven2org/apache/ant/ant/1.9.7/ant-1.9.7.jar"
                 ],
-                "sha256": "92f72307e7440f1e352c916f2438d2bbab3ffd2cf730c71316117ad04abadea8",
-                "url": "https://jcenter.bintray.com/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"
+                "sha256": "9a5dbe3f5f2cb91854c8682cab80178afa412ab35a5ab718bf39ce01b3435d93",
+                "url": "https://jcenter.bintray.com/org/apache/ant/ant/1.9.7/ant-1.9.7.jar"
             },
             {
                 "coord": "org.apache.velocity:velocity:1.7",