From 138f342cfb8c4a84fc6bcf2378016f82c9ddf115 Mon Sep 17 00:00:00 2001 From: Gerwin Klein Date: Sat, 11 Mar 2023 17:30:22 +1100 Subject: [PATCH] Bump version to JFlex 1.9.1 --- README.md | 41 ++++++++++++++------------------- jflex/deps.bzl | 2 +- maven_install.json | 56 +++++++++++++++++++++++----------------------- 3 files changed, 46 insertions(+), 53 deletions(-) diff --git a/README.md b/README.md index 32605d4..17f0176 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,8 @@ and add `JFLEX_ARTIFACTS` in your `maven_install` rule: http_archive( name = "jflex_rules", sha256 = "488e523bfed0e1793c68264341bc9c3050f4de3e4aa920f9a72d76ae327935e6", - strip_prefix = "bazel_rules-1.9.0", - url = "https://github.com/jflex-de/bazel_rules/archive/v1.9.0.tar.gz", + strip_prefix = "bazel_rules-1.9.1", + url = "https://github.com/jflex-de/bazel_rules/archive/v1.9.1.tar.gz", ) load("@jflex_rules//jflex:deps.bzl", "JFLEX_ARTIFACTS") @@ -53,16 +53,12 @@ and add `JFLEX_ARTIFACTS` in your `maven_install` rule: ) If this is the first time you use `maven_install`, you need to generate the `maven_install.json` with - -``` -bazel run @maven//:pin -``` + + bazel run @maven//:pin If you already used `maven_install` before, you need to update the pinned artifacts with: -``` -bazel run @unpinned_maven//:pin -``` + bazel run @unpinned_maven//:pin ## Usage in BUILD files @@ -74,7 +70,7 @@ bazel run @unpinned_maven//:pin srcs = [], # A list of flex specifications outputs = [], # List of expected generated files ) - + cup( name = "", # Choose a rule name src = "", # Grammar specification @@ -85,24 +81,21 @@ As usual, these rules can be used as one of the `srcs` of another rules, such as For more details, see [cup](cup) and [jflex](jflex). ## Directory layout - ``` -├── assets → assets for the web site -├── cup → contains the `cup.bzl` Skylark extension -├── java → main Java source code -│ └── jflex -│ └── examples → examples -│ ├── calculator → integration of JFlex and CUP -│ └── helloworld → simple lexer -├── javatests → tests of the examples -├── jflex → contains the `jflex.bzl` Skylark extension -└── third_party → Aliases for third-party libraries -``` + ├── assets → assets for the web site + ├── cup → contains the `cup.bzl` Skylark extension + ├── java → main Java source code + │ └── jflex + │ └── examples → examples + │ ├── calculator → integration of JFlex and CUP + │ └── helloworld → simple lexer + ├── javatests → tests of the examples + ├── jflex → contains the `jflex.bzl` Skylark extension + └── third_party → Aliases for third-party libraries [bazel]: http://bazel.build/ [gh-jflex]: https://github.com/jflex-de/jflex [cup]: http://www2.cs.tum.edu/projects/cup/ -[be_maven_jar]: https://docs.bazel.build/versions/master/be/workspace.html#maven_jar -[be_workspace]: https://docs.bazel.build/versions/master/tutorial/java.html#set-up-the-workspace +[be_workspace]: https://docs.bazel.build/versions/master/tutorial/java.html#set-up-the-workspace [bb_jvm_external]: https://github.com/bazelbuild/rules_jvm_external diff --git a/jflex/deps.bzl b/jflex/deps.bzl index e155081..8f8eeec 100644 --- a/jflex/deps.bzl +++ b/jflex/deps.bzl @@ -4,6 +4,6 @@ # After updating dependencies, tun # bazel run @unpinned_maven//:pin JFLEX_ARTIFACTS = [ - "de.jflex:jflex:jar:1.9.0", + "de.jflex:jflex:jar:1.9.1", "com.github.vbmacher:java-cup-runtime:jar:11b-20160615-1", ] diff --git a/maven_install.json b/maven_install.json index 43e4f69..a52baeb 100644 --- a/maven_install.json +++ b/maven_install.json @@ -1,6 +1,6 @@ { "dependency_tree": { - "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": 1608248307, + "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": 1980087307, "conflict_resolution": {}, "dependencies": [ { @@ -184,26 +184,26 @@ "url": "https://repo1.maven.org/maven2/com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0.jar" }, { - "coord": "de.jflex:jflex:1.9.0", + "coord": "de.jflex:jflex:1.9.1", "dependencies": [ "com.github.vbmacher:java-cup-runtime:11b-20160615-1", - "org.apache.ant:ant-launcher:1.10.12", - "org.apache.ant:ant:1.10.12", - "com.google.code.findbugs:jsr305:3.0.2" + "org.apache.ant:ant-launcher:1.10.13", + "com.google.code.findbugs:jsr305:3.0.2", + "org.apache.ant:ant:1.10.13" ], "directDependencies": [ "com.github.vbmacher:java-cup-runtime:11b-20160615-1", "com.google.code.findbugs:jsr305:3.0.2", - "org.apache.ant:ant:1.10.12" + "org.apache.ant:ant:1.10.13" ], - "file": "v1/https/jcenter.bintray.com/de/jflex/jflex/1.9.0/jflex-1.9.0.jar", + "file": "v1/https/jcenter.bintray.com/de/jflex/jflex/1.9.1/jflex-1.9.1.jar", "mirror_urls": [ - "https://jcenter.bintray.com/de/jflex/jflex/1.9.0/jflex-1.9.0.jar", - "https://maven.google.com/de/jflex/jflex/1.9.0/jflex-1.9.0.jar", - "https://repo1.maven.org/maven2/de/jflex/jflex/1.9.0/jflex-1.9.0.jar" + "https://jcenter.bintray.com/de/jflex/jflex/1.9.1/jflex-1.9.1.jar", + "https://maven.google.com/de/jflex/jflex/1.9.1/jflex-1.9.1.jar", + "https://repo1.maven.org/maven2/de/jflex/jflex/1.9.1/jflex-1.9.1.jar" ], - "sha256": "0b051212b9e9c8af51188541dd2226362ee1e7fd8184d2bb10e91111eb7b62d7", - "url": "https://jcenter.bintray.com/de/jflex/jflex/1.9.0/jflex-1.9.0.jar" + "sha256": "2888d90d6a5ee37166a5e339b1616ad3a2604e6cce246e61deaf115487b18350", + "url": "https://jcenter.bintray.com/de/jflex/jflex/1.9.1/jflex-1.9.1.jar" }, { "coord": "junit:junit:4.12", @@ -223,34 +223,34 @@ "url": "https://jcenter.bintray.com/junit/junit/4.12/junit-4.12.jar" }, { - "coord": "org.apache.ant:ant-launcher:1.10.12", + "coord": "org.apache.ant:ant-launcher:1.10.13", "dependencies": [], "directDependencies": [], - "file": "v1/https/jcenter.bintray.com/org/apache/ant/ant-launcher/1.10.12/ant-launcher-1.10.12.jar", + "file": "v1/https/jcenter.bintray.com/org/apache/ant/ant-launcher/1.10.13/ant-launcher-1.10.13.jar", "mirror_urls": [ - "https://jcenter.bintray.com/org/apache/ant/ant-launcher/1.10.12/ant-launcher-1.10.12.jar", - "https://maven.google.com/org/apache/ant/ant-launcher/1.10.12/ant-launcher-1.10.12.jar", - "https://repo1.maven.org/maven2/org/apache/ant/ant-launcher/1.10.12/ant-launcher-1.10.12.jar" + "https://jcenter.bintray.com/org/apache/ant/ant-launcher/1.10.13/ant-launcher-1.10.13.jar", + "https://maven.google.com/org/apache/ant/ant-launcher/1.10.13/ant-launcher-1.10.13.jar", + "https://repo1.maven.org/maven2/org/apache/ant/ant-launcher/1.10.13/ant-launcher-1.10.13.jar" ], - "sha256": "42a7ca7e7bb777fe7ee75a5ed4cc529c766bc43486367fdaad0ab4a32ee9c249", - "url": "https://jcenter.bintray.com/org/apache/ant/ant-launcher/1.10.12/ant-launcher-1.10.12.jar" + "sha256": "cd7695b3bfb6964ab71b6a0b31dad60005ae77fe502132364679aacf08f77970", + "url": "https://jcenter.bintray.com/org/apache/ant/ant-launcher/1.10.13/ant-launcher-1.10.13.jar" }, { - "coord": "org.apache.ant:ant:1.10.12", + "coord": "org.apache.ant:ant:1.10.13", "dependencies": [ - "org.apache.ant:ant-launcher:1.10.12" + "org.apache.ant:ant-launcher:1.10.13" ], "directDependencies": [ - "org.apache.ant:ant-launcher:1.10.12" + "org.apache.ant:ant-launcher:1.10.13" ], - "file": "v1/https/jcenter.bintray.com/org/apache/ant/ant/1.10.12/ant-1.10.12.jar", + "file": "v1/https/jcenter.bintray.com/org/apache/ant/ant/1.10.13/ant-1.10.13.jar", "mirror_urls": [ - "https://jcenter.bintray.com/org/apache/ant/ant/1.10.12/ant-1.10.12.jar", - "https://maven.google.com/org/apache/ant/ant/1.10.12/ant-1.10.12.jar", - "https://repo1.maven.org/maven2/org/apache/ant/ant/1.10.12/ant-1.10.12.jar" + "https://jcenter.bintray.com/org/apache/ant/ant/1.10.13/ant-1.10.13.jar", + "https://maven.google.com/org/apache/ant/ant/1.10.13/ant-1.10.13.jar", + "https://repo1.maven.org/maven2/org/apache/ant/ant/1.10.13/ant-1.10.13.jar" ], - "sha256": "5c6a438c3ebe7a306eba452b09fa307b0e60314926177920bca896c4a504eaf6", - "url": "https://jcenter.bintray.com/org/apache/ant/ant/1.10.12/ant-1.10.12.jar" + "sha256": "befbfc79e744e9892cfa7db96df3b6e82dc17d2571af42aa427976fc22299838", + "url": "https://jcenter.bintray.com/org/apache/ant/ant/1.10.13/ant-1.10.13.jar" }, { "coord": "org.checkerframework:checker-compat-qual:2.5.5",