Skip to content

Commit 80773cf

Browse files
parrtparrt
committed
Update more 4.13.0 strings to 4.13.1
1 parent 8a008b5 commit 80773cf

File tree

3 files changed

+51
-50
lines changed

3 files changed

+51
-50
lines changed

‎doc/go-target.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ golang.org/x/exp
9191
```
9292

9393
A complete list of releases can be found on [the release page](https://github.com/antlr/antlr4/releases). The Go
94-
runtime will be tagged using standard Go tags, so release 4.13.0 in the `antlr4-go/antlr` repo, will be tagged with
95-
`v4.13.0` and go get will pick that up from the ANTLR repo.
94+
runtime will be tagged using standard Go tags, so release 4.13.1 in the `antlr4-go/antlr` repo, will be tagged with
95+
`v4.13.1` and go get will pick that up from the ANTLR repo.
9696

9797
#### 3. Configuring `go generate` in your project
9898

@@ -108,7 +108,7 @@ place the ANTLR grammar files in their own package in your project structure. He
108108
├── myproject
109109
├── parser
110110
│ ├── mygrammar.g4
111-
│ ├── antlr-4.13.0-complete.jar
111+
│ ├── antlr-4.13.1-complete.jar
112112
│ ├── generate.go
113113
│ └── generate.sh
114114
├── parsing # Generated code goes here
@@ -133,7 +133,7 @@ And the `generate.sh` file will look similar to this:
133133
```shell
134134
#!/bin/sh
135135

136-
alias antlr4='java -Xmx500M -cp "./antlr-4.13.0-complete.jar:$CLASSPATH" org.antlr.v4.Tool'
136+
alias antlr4='java -Xmx500M -cp "./antlr-4.13.1-complete.jar:$CLASSPATH" org.antlr.v4.Tool'
137137
antlr4 -Dlanguage=Go -no-visitor -package parsing *.g4
138138
```
139139

‎doc/releasing-antlr.md

+46-46
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,21 @@ Make sure this feature is turned on for the `antlr4` repo upon release.
2525
Wack any existing tag as mvn will create one and it fails if already there.
2626

2727
```
28-
$ git tag -d 4.13.0
29-
$ git push origin :refs/tags/4.13.0
30-
$ git push upstream :refs/tags/4.13.0
28+
$ git tag -d 4.13.1
29+
$ git push origin :refs/tags/4.13.1
30+
$ git push upstream :refs/tags/4.13.1
3131
```
3232

3333
### Go release tags
3434

3535
*I don't think this is necessary anymore as we have moved it release branch to https://github.com/antlr4-go/antlr*
3636

37-
It seems that [Go needs a `v` in the release git tag](https://go.dev/ref/mod#glos-version) so make sure that we double up with 4.13.0 and v4.13.0.
37+
It seems that [Go needs a `v` in the release git tag](https://go.dev/ref/mod#glos-version) so make sure that we double up with 4.13.1 and v4.13.1.
3838

3939
```
40-
$ git tag -a runtime/Go/antlr/v4/v4.13.0 -m "Go runtime module only"
41-
$ git push upstream runtime/Go/antlr/v4/v4.13.0
42-
$ git push origin runtime/Go/antlr/v4/v4.13.0
40+
$ git tag -a runtime/Go/antlr/v4/v4.13.1 -m "Go runtime module only"
41+
$ git push upstream runtime/Go/antlr/v4/v4.13.1
42+
$ git push origin runtime/Go/antlr/v4/v4.13.1
4343
```
4444

4545

@@ -77,7 +77,7 @@ Commit to repository.
7777

7878
### PHP runtime
7979

80-
We only have to copy the PHP runtime into the ANTLR repository to run the unittests. But, we still need to bump the version to 4.13.0 in `~/antlr/code/antlr-php-runtime/src/RuntimeMetaData.php` in the separate repository, commit, and push.
80+
We only have to copy the PHP runtime into the ANTLR repository to run the unittests. But, we still need to bump the version to 4.13.1 in `~/antlr/code/antlr-php-runtime/src/RuntimeMetaData.php` in the separate repository, commit, and push.
8181

8282
```
8383
cd ~/antlr/code/antlr-php-runtime/src
@@ -94,19 +94,19 @@ git push origin master
9494

9595
## Build XPath parsers
9696

97-
This section addresses a [circular dependency regarding XPath](https://github.com/antlr/antlr4/issues/3600). In the java target I avoided a circular dependency (gen 4.13.0 parser for XPath using 4.13.0 which needs it to build) by hand building the parser: runtime/Java/src/org/antlr/v4/runtime/tree/xpath/XPath.java. Probably we won't have to rerun this for the patch releases, just major ones that alter the ATN serialization.
97+
This section addresses a [circular dependency regarding XPath](https://github.com/antlr/antlr4/issues/3600). In the java target I avoided a circular dependency (gen 4.13.1 parser for XPath using 4.13.1 which needs it to build) by hand building the parser: runtime/Java/src/org/antlr/v4/runtime/tree/xpath/XPath.java. Probably we won't have to rerun this for the patch releases, just major ones that alter the ATN serialization.
9898

9999
```bash
100100
cd ~/antlr/code/antlr4/runtime/Cpp/runtime/src/tree/xpath
101-
java -cp ":/Users/parrt/.m2/repository/org/antlr/antlr4/4.13.0-SNAPSHOT/antlr4-4.13.0-SNAPSHOT-complete.jar:$CLASSPATH" org.antlr.v4.Tool -Dlanguage=Cpp XPathLexer.g4
101+
java -cp ":/Users/parrt/.m2/repository/org/antlr/antlr4/4.13.1-SNAPSHOT/antlr4-4.13.1-SNAPSHOT-complete.jar:$CLASSPATH" org.antlr.v4.Tool -Dlanguage=Cpp XPathLexer.g4
102102

103103
cd ~/antlr/code/antlr4/runtime/CSharp/src/Tree/Xpath
104-
java -cp ":/Users/parrt/.m2/repository/org/antlr/antlr4/4.13-0-SNAPSHOT/antlr4-4.13-0-SNAPSHOT-complete.jar:$CLASSPATH" org.antlr.v4.Tool -Dlanguage=CSharp XPathLexer.g4
104+
java -cp ":/Users/parrt/.m2/repository/org/antlr/antlr4/4.13.1-SNAPSHOT/antlr4-4.13.1-SNAPSHOT-complete.jar:$CLASSPATH" org.antlr.v4.Tool -Dlanguage=CSharp XPathLexer.g4
105105

106106
cd ~/antlr/code/antlr4/runtime/Python3/tests/expr
107-
java -cp ":/Users/parrt/.m2/repository/org/antlr/antlr4/4.13-0-SNAPSHOT/antlr4-4.13-0-SNAPSHOT-complete.jar:$CLASSPATH" org.antlr.v4.Tool -Dlanguage=Python3 Expr.g4
107+
java -cp ":/Users/parrt/.m2/repository/org/antlr/antlr4/4.13.1-SNAPSHOT/antlr4-4.13.1-SNAPSHOT-complete.jar:$CLASSPATH" org.antlr.v4.Tool -Dlanguage=Python3 Expr.g4
108108
cd ~/antlr/code/antlr4/runtime/Python3/src/antlr4/xpath
109-
java -cp ":/Users/parrt/.m2/repository/org/antlr/antlr4/4.13-0-SNAPSHOT/antlr4-4.13-0-SNAPSHOT-complete.jar:$CLASSPATH" org.antlr.v4.Tool -Dlanguage=Python3 XPathLexer.g4
109+
java -cp ":/Users/parrt/.m2/repository/org/antlr/antlr4/4.13.1-SNAPSHOT/antlr4-4.13.1-SNAPSHOT-complete.jar:$CLASSPATH" org.antlr.v4.Tool -Dlanguage=Python3 XPathLexer.g4
110110
```
111111

112112
## Maven Repository Settings
@@ -156,7 +156,7 @@ Here is the file template
156156

157157
## Maven deploy snapshot
158158

159-
The goal is to get a snapshot, such as `4.13.0-SNAPSHOT`, to the staging server: [antlr4 tool](https://oss.sonatype.org/content/repositories/snapshots/org/antlr/antlr4/4.13.0-SNAPSHOT/) and [antlr4 java runtime](https://oss.sonatype.org/content/repositories/snapshots/org/antlr/antlr4-runtime/4.13.0-SNAPSHOT/).
159+
The goal is to get a snapshot, such as `4.13.1-SNAPSHOT`, to the staging server: [antlr4 tool](https://oss.sonatype.org/content/repositories/snapshots/org/antlr/antlr4/4.13.1-SNAPSHOT/) and [antlr4 java runtime](https://oss.sonatype.org/content/repositories/snapshots/org/antlr/antlr4-runtime/4.13.1-SNAPSHOT/).
160160

161161
Do this:
162162

@@ -227,18 +227,18 @@ It will start out by asking you the version number:
227227

228228
```
229229
...
230-
What is the release version for "ANTLR 4"? (org.antlr:antlr4-master) 4.13.0: : 4.13.0
231-
What is the release version for "ANTLR 4 Runtime"? (org.antlr:antlr4-runtime) 4.13.0: :
232-
What is the release version for "ANTLR 4 Tool"? (org.antlr:antlr4) 4.13.0: :
233-
What is the release version for "ANTLR 4 Maven plugin"? (org.antlr:antlr4-maven-plugin) 4.13.0: :
234-
What is the release version for "ANTLR 4 Runtime Test Generator"? (org.antlr:antlr4-runtime-testsuite) 4.13.0: :
235-
What is the release version for "ANTLR 4 Tool Tests"? (org.antlr:antlr4-tool-testsuite) 4.13.0: :
236-
What is SCM release tag or label for "ANTLR 4"? (org.antlr:antlr4-master) antlr4-master-4.13.0: : 4.13.0
237-
What is the new development version for "ANTLR 4"? (org.antlr:antlr4-master) 4.13.1-SNAPSHOT:
230+
What is the release version for "ANTLR 4"? (org.antlr:antlr4-master) 4.13.1: : 4.13.1
231+
What is the release version for "ANTLR 4 Runtime"? (org.antlr:antlr4-runtime) 4.13.1: :
232+
What is the release version for "ANTLR 4 Tool"? (org.antlr:antlr4) 4.13.1: :
233+
What is the release version for "ANTLR 4 Maven plugin"? (org.antlr:antlr4-maven-plugin) 4.13.1: :
234+
What is the release version for "ANTLR 4 Runtime Test Generator"? (org.antlr:antlr4-runtime-testsuite) 4.13.1: :
235+
What is the release version for "ANTLR 4 Tool Tests"? (org.antlr:antlr4-tool-testsuite) 4.13.1: :
236+
What is SCM release tag or label for "ANTLR 4"? (org.antlr:antlr4-master) antlr4-master-4.13.1: : 4.13.1
237+
What is the new development version for "ANTLR 4"? (org.antlr:antlr4-master) 4.13.2-SNAPSHOT:
238238
...
239239
```
240240

241-
Maven will go through your pom.xml files to update versions from 4.13.0-SNAPSHOT to 4.13.0 for release and then to 4.13.1-SNAPSHOT after release, which is done with:
241+
Maven will go through your pom.xml files to update versions from 4.13.1-SNAPSHOT to 4.13.1 for release and then to 4.13.2-SNAPSHOT after release, which is done with:
242242

243243
```bash
244244
mvn release:perform -Darguments="-DskipTests"
@@ -252,7 +252,7 @@ Now, go here:
252252

253253
and on the left click "Staging Repositories". You click the staging repo and close it, then you refresh, click it and release it. It's done when you see it here:
254254

255-
    [https://oss.sonatype.org/service/local/repositories/releases/content/org/antlr/antlr4-runtime/4.13.0/antlr4-runtime-4.13.0.jar](https://oss.sonatype.org/service/local/repositories/releases/content/org/antlr/antlr4-runtime/4.13.0/antlr4-runtime-4.13.0.jar)
255+
    [https://oss.sonatype.org/service/local/repositories/releases/content/org/antlr/antlr4-runtime/4.13.1/antlr4-runtime-4.13.1.jar](https://oss.sonatype.org/service/local/repositories/releases/content/org/antlr/antlr4-runtime/4.13.1/antlr4-runtime-4.13.1.jar)
256256

257257
All releases should be here: [https://repo1.maven.org/maven2/org/antlr/antlr4-runtime](https://repo1.maven.org/maven2/org/antlr/antlr4-runtime).
258258

@@ -276,7 +276,7 @@ Move (and zip) target to website:
276276

277277
```bash
278278
cd src
279-
zip -r ~/antlr/sites/website-antlr4/download/antlr-javascript-runtime-4.13.0.zip .
279+
zip -r ~/antlr/sites/website-antlr4/download/antlr-javascript-runtime-4.13.1.zip .
280280
```
281281

282282
### CSharp
@@ -367,32 +367,32 @@ On a Mac (with XCode 7+ installed):
367367
```bash
368368
cd ~/antlr/code/antlr4/runtime/Cpp
369369
./deploy-macos.sh
370-
cp antlr4-cpp-runtime-macos.zip ~/antlr/sites/website-antlr4/download/antlr4-cpp-runtime-4.13.0-macos.zip
370+
cp antlr4-cpp-runtime-macos.zip ~/antlr/sites/website-antlr4/download/antlr4-cpp-runtime-4.13.1-macos.zip
371371
```
372372

373373
On any Mac or Linux machine:
374374

375375
```bash
376376
cd ~/antlr/code/antlr4/runtime/Cpp
377377
./deploy-source.sh
378-
cp antlr4-cpp-runtime-source.zip ~/antlr/sites/website-antlr4/download/antlr4-cpp-runtime-4.13.0-source.zip
378+
cp antlr4-cpp-runtime-source.zip ~/antlr/sites/website-antlr4/download/antlr4-cpp-runtime-4.13.1-source.zip
379379
```
380380

381381
On a Windows machine the build scripts checks if VS 2017 and/or VS 2019 are installed and builds binaries for each, if found. This script requires 7z to be installed (http://7-zip.org then do `set PATH=%PATH%;C:\Program Files\7-Zip\` from DOS not powershell).
382382

383383
```bash
384384
cd ~/antlr/code/antlr4/runtime/Cpp
385385
deploy-windows.cmd Community
386-
cp antlr4-cpp-runtime-vs2019.zip ~/antlr/sites/website-antlr4/download/antlr4-cpp-runtime-4.13.0-vs2019.zip
386+
cp antlr4-cpp-runtime-vs2019.zip ~/antlr/sites/website-antlr4/download/antlr4-cpp-runtime-4.13.1-vs2019.zip
387387
```
388388

389389
Move target to website (**_rename to a specific ANTLR version first if needed_**):
390390

391391
```bash
392392
pushd ~/antlr/sites/website-antlr4/download
393-
git add antlr4-cpp-runtime-4.13.0-macos.zip
394-
git add antlr4-cpp-runtime-4.13.0-windows.zip
395-
git add antlr4-cpp-runtime-4.13.0-source.zip
393+
git add antlr4-cpp-runtime-4.13.1-macos.zip
394+
git add antlr4-cpp-runtime-4.13.1-windows.zip
395+
git add antlr4-cpp-runtime-4.13.1-source.zip
396396
git commit -a -m 'update C++ runtime'
397397
git push origin gh-pages
398398
popd
@@ -419,7 +419,7 @@ Otherwise enter `N` to ignore the warning.
419419
Jars are in:
420420

421421
```
422-
~/.m2/repository/org/antlr/antlr4-runtime/4.13.0/antlr4-runtime-4.13.0
422+
~/.m2/repository/org/antlr/antlr4-runtime/4.13.1/antlr4-runtime-4.13.1
423423
```
424424

425425
### Update version and copy jars / api
@@ -428,44 +428,44 @@ Copy javadoc and java jars to website using this script:
428428

429429
```bash
430430
cd ~/antlr/code/antlr4
431-
python scripts/deploy_to_website.py 4.12.0 4.13.0
431+
python scripts/deploy_to_website.py 4.13.0 4.13.1
432432
```
433433

434434
Output:
435435

436436
```bash
437-
Updating ANTLR version from 4.12.0 to 4.13.0
437+
Updating ANTLR version from 4.13.0 to 4.13.1
438438
Set ANTLR website root (default /Users/parrt/antlr/sites/website-antlr4):
439439
Version string updated. Please commit/push:
440440
Javadoc copied:
441-
api/Java updated from antlr4-runtime-4.13.0-javadoc.jar
442-
api/JavaTool updated from antlr4-4.13.0-javadoc.jar
441+
api/Java updated from antlr4-runtime-4.13.1-javadoc.jar
442+
api/JavaTool updated from antlr4-4.13.1-javadoc.jar
443443
Jars copied:
444-
antlr-4.13.0-complete.jar
445-
antlr-runtime-4.13.0.jar
444+
antlr-4.13.1-complete.jar
445+
antlr-runtime-4.13.1.jar
446446

447447
Please look for and add new api files!!
448448
Then MANUALLY commit/push:
449449

450-
git commit -a -m 'Update website, javadoc, jars to 4.13.0'
450+
git commit -a -m 'Update website, javadoc, jars to 4.13.1'
451451
git push origin gh-pages
452452
```
453453

454454
<!--
455455
```bash
456-
cp ~/.m2/repository/org/antlr/antlr4-runtime/4.13.0/antlr4-runtime-4.13.0.jar ~/antlr/sites/website-antlr4/download/antlr-runtime-4.13.0.jar
457-
cp ~/.m2/repository/org/antlr/antlr4/4.13.0/antlr4-4.13.0-complete.jar ~/antlr/sites/website-antlr4/download/antlr-4.13.0-complete.jar
456+
cp ~/.m2/repository/org/antlr/antlr4-runtime/4.13.1/antlr4-runtime-4.13.1.jar ~/antlr/sites/website-antlr4/download/antlr-runtime-4.13.1.jar
457+
cp ~/.m2/repository/org/antlr/antlr4/4.13.1/antlr4-4.13.1-complete.jar ~/antlr/sites/website-antlr4/download/antlr-4.13.1-complete.jar
458458
cd ~/antlr/sites/website-antlr4/download
459-
git add antlr-4.13.0-complete.jar
460-
git add antlr-runtime-4.13.0.jar
459+
git add antlr-4.13.1-complete.jar
460+
git add antlr-runtime-4.13.1.jar
461461
```
462462
-->
463463

464464
Once it's done, you must do the following manually:
465465

466466
```
467467
cd ~/antlr/sites/website-antlr4
468-
git commit -a -m 'Update website, javadoc, jars to 4.13.0'
468+
git commit -a -m 'Update website, javadoc, jars to 4.13.1'
469469
git push origin gh-pages
470470
```
471471

@@ -477,9 +477,9 @@ cd ~/antlr/sites/website-antlr4/api
477477
git checkout gh-pages
478478
git pull origin gh-pages
479479
cd Java
480-
jar xvf ~/.m2/repository/org/antlr/antlr4-runtime/4.13.0/antlr4-runtime-4.13.0-javadoc.jar
480+
jar xvf ~/.m2/repository/org/antlr/antlr4-runtime/4.13.1/antlr4-runtime-4.13.1-javadoc.jar
481481
cd ../JavaTool
482-
jar xvf ~/.m2/repository/org/antlr/antlr4/4.13.0/antlr4-4.13.0-javadoc.jar
482+
jar xvf ~/.m2/repository/org/antlr/antlr4/4.13.1/antlr4-4.13.1-javadoc.jar
483483
git commit -a -m 'freshen api doc'
484484
git push origin gh-pages
485485
```

‎runtime/Swift/Tests/Antlr4Tests/RuntimeMetaDataTests.swift

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class RuntimeMetaDataTests: XCTestCase {
3838
doGetMajorMinorVersionTest("4.12.0", "4.12")
3939
doGetMajorMinorVersionTest("4.13.0-SNAPSHOT", "4.13")
4040
doGetMajorMinorVersionTest("4.13.0", "4.13")
41+
doGetMajorMinorVersionTest("4.13.1", "4.13")
4142
}
4243
}
4344

0 commit comments

Comments
 (0)