Skip to content

Commit

Permalink
Merge pull request #5 from ptr1120/feature/nuget-update
Browse files Browse the repository at this point in the history
updated antlr 4.12.0 -> 4.13.1
  • Loading branch information
ptr1120 authored Sep 25, 2023
2 parents cf8564c + 8936607 commit b47c248
Show file tree
Hide file tree
Showing 14 changed files with 28 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"antlr4codegenerator.tool": {
"version": "2.1.0",
"version": "2.2.0",
"commands": [
"antlr4-tool"
]
Expand Down
3 changes: 2 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [vNext]

- Updated dependencies:
- Antlr 4.12.0 -> 4.13.1
## [2.1.0] / 2023-04-01
- Updated dependencies:
- Antlr 4.11.1 -> 4.12.0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@



Just a commandline wrapper around the ANTLR (Java) tool ([Version 4.12.0](https://www.antlr.org/download/antlr-4.12.0-complete.jar)) for generating grammar artifacts.
Just a commandline wrapper around the ANTLR (Java) tool ([Version 4.13.1](https://www.antlr.org/download/antlr-4.13.1-complete.jar)) for generating grammar artifacts.

The ANTLR (Java) tool is *bundled*, so no need to download it.

Expand Down
4 changes: 2 additions & 2 deletions build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class Build : NukeBuild
readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;

[Parameter("The ANTLR Java tool version.")]
readonly string AntlrVersion = "4.12.0";
readonly string AntlrVersion = "4.13.1";

[Parameter("NuGet Api Key")]
readonly string NugetApiKey;
Expand Down Expand Up @@ -196,7 +196,7 @@ class Build : NukeBuild
.DependsOn(InstallTool)
.Consumes(PackNuget)
.OnlyWhenDynamic(() => DoPublishNuget)
.Requires(() => GitHasCleanWorkingCopy())
// .Requires(() => GitHasCleanWorkingCopy())
.Requires(() => Configuration.Equals(Configuration.Release))
.Executes(() =>
{
Expand Down
2 changes: 1 addition & 1 deletion build/_build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="6.3.0" />
<PackageReference Include="Nuke.Common" Version="7.0.6" />
<PackageDownload Include="GitVersion.Tool" Version="[5.8.0]" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion samples/Calculator/Calculator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Antlr4.Runtime.Standard" Version="4.12.0" />
<PackageReference Include="Antlr4.Runtime.Standard" Version="4.13.1" />
</ItemGroup>

<Target Name="GenerateAntlrArtifacts" BeforeTargets="BeforeResolveReferences">
Expand Down
6 changes: 3 additions & 3 deletions samples/Calculator/generated/calculatorBaseListener.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// ANTLR Version: 4.12.0
// ANTLR Version: 4.13.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

// Generated from calculator.g4 by ANTLR 4.12.0
// Generated from calculator.g4 by ANTLR 4.13.1

// Unreachable code detected
#pragma warning disable 0162
Expand All @@ -32,7 +32,7 @@ namespace MyCalculator {
/// which can be extended to create a listener which only needs to handle a subset
/// of the available methods.
/// </summary>
[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.12.0")]
[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.13.1")]
[System.Diagnostics.DebuggerNonUserCode]
[System.CLSCompliant(false)]
public partial class calculatorBaseListener : IcalculatorListener {
Expand Down
6 changes: 3 additions & 3 deletions samples/Calculator/generated/calculatorBaseVisitor.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// ANTLR Version: 4.12.0
// ANTLR Version: 4.13.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

// Generated from calculator.g4 by ANTLR 4.12.0
// Generated from calculator.g4 by ANTLR 4.13.1

// Unreachable code detected
#pragma warning disable 0162
Expand All @@ -31,7 +31,7 @@ namespace MyCalculator {
/// of the available methods.
/// </summary>
/// <typeparam name="Result">The return type of the visit operation.</typeparam>
[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.12.0")]
[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.13.1")]
[System.Diagnostics.DebuggerNonUserCode]
[System.CLSCompliant(false)]
public partial class calculatorBaseVisitor<Result> : AbstractParseTreeVisitor<Result>, IcalculatorVisitor<Result> {
Expand Down
6 changes: 3 additions & 3 deletions samples/Calculator/generated/calculatorLexer.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// ANTLR Version: 4.12.0
// ANTLR Version: 4.13.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

// Generated from calculator.g4 by ANTLR 4.12.0
// Generated from calculator.g4 by ANTLR 4.13.1

// Unreachable code detected
#pragma warning disable 0162
Expand All @@ -28,7 +28,7 @@ namespace MyCalculator {
using Antlr4.Runtime.Misc;
using DFA = Antlr4.Runtime.Dfa.DFA;

[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.12.0")]
[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.13.1")]
[System.CLSCompliant(false)]
public partial class calculatorLexer : Lexer {
protected static DFA[] decisionToDFA;
Expand Down
6 changes: 3 additions & 3 deletions samples/Calculator/generated/calculatorListener.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// ANTLR Version: 4.12.0
// ANTLR Version: 4.13.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

// Generated from calculator.g4 by ANTLR 4.12.0
// Generated from calculator.g4 by ANTLR 4.13.1

// Unreachable code detected
#pragma warning disable 0162
Expand All @@ -28,7 +28,7 @@ namespace MyCalculator {
/// This interface defines a complete listener for a parse tree produced by
/// <see cref="calculatorParser"/>.
/// </summary>
[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.12.0")]
[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.13.1")]
[System.CLSCompliant(false)]
public interface IcalculatorListener : IParseTreeListener {
/// <summary>
Expand Down
6 changes: 3 additions & 3 deletions samples/Calculator/generated/calculatorParser.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// ANTLR Version: 4.12.0
// ANTLR Version: 4.13.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

// Generated from calculator.g4 by ANTLR 4.12.0
// Generated from calculator.g4 by ANTLR 4.13.1

// Unreachable code detected
#pragma warning disable 0162
Expand All @@ -31,7 +31,7 @@ namespace MyCalculator {
using Antlr4.Runtime.Tree;
using DFA = Antlr4.Runtime.Dfa.DFA;

[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.12.0")]
[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.13.1")]
[System.CLSCompliant(false)]
public partial class calculatorParser : Parser {
protected static DFA[] decisionToDFA;
Expand Down
6 changes: 3 additions & 3 deletions samples/Calculator/generated/calculatorVisitor.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// ANTLR Version: 4.12.0
// ANTLR Version: 4.13.1
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------

// Generated from calculator.g4 by ANTLR 4.12.0
// Generated from calculator.g4 by ANTLR 4.13.1

// Unreachable code detected
#pragma warning disable 0162
Expand All @@ -29,7 +29,7 @@ namespace MyCalculator {
/// by <see cref="calculatorParser"/>.
/// </summary>
/// <typeparam name="Result">The return type of the visit operation.</typeparam>
[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.12.0")]
[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.13.1")]
[System.CLSCompliant(false)]
public interface IcalculatorVisitor<Result> : IParseTreeVisitor<Result> {
/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/tool/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ internal class Program
private const string ExecutableName = "java";

private static readonly string AntlrToolPath =
Path.Combine(Path.GetDirectoryName(typeof(Program).Assembly.Location) ?? ".", "tools", "antlr-4.12.0-complete.jar");
Path.Combine(Path.GetDirectoryName(typeof(Program).Assembly.Location) ?? ".", "tools", "antlr-4.13.1-complete.jar");

private static readonly string[] JavaArgs = { "-jar", AntlrToolPath };

Expand Down
2 changes: 1 addition & 1 deletion src/tool/Tool.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</PropertyGroup>

<ItemGroup>
<None Update="tools\antlr-4.12.0-complete.jar">
<None Update="tools\antlr-4.13.1-complete.jar">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="../../README.md" Pack="true" PackagePath="\"/>
Expand Down

0 comments on commit b47c248

Please sign in to comment.