Skip to content

Commit

Permalink
Merge pull request #67 from zbynek/def-update
Browse files Browse the repository at this point in the history
Bump default JavaCC version to 7.0.12, update readme
  • Loading branch information
zbynek authored Jul 18, 2023
2 parents 7a39972 + a73c4ac commit c74a825
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 12 deletions.
11 changes: 2 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ jjdoc {

This plugin requires Java 8+.

It has been tested with Gradle 6.0.1+. Please let us know if you have had success with other versions of Gradle.
It has been tested with Gradle 6.4+. Please let us know if you have had success with other versions of Gradle.

## Signature

Expand All @@ -144,14 +144,7 @@ The following command can be used to release the project, upload to Maven Centra

## Changelog

### 3.0.0-SNAPSHOT
- Fix acceptance tests under Windows [Pull Request #37](https://github.com/javacc/javaccPlugin/pull/37)
- Build with Gradle 6.4

*Breaking changes*
- Plugin id changed to 'org.javacc.javacc'
- Plugin now requires Gradle 6.0.1 to work
- Plugin now requies Java 8 or higher
### For version 3.0 and later see [GitHub Releases](https://github.com/javacc/javaccPlugin/releases).

### 2.4.0
- Allow configuration of the JavaCC version to use (Issue #29)
Expand Down
4 changes: 2 additions & 2 deletions subprojects/plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ dependencies {
testImplementation 'org.powermock:powermock-module-junit4:1.6.4'
testImplementation 'org.powermock:powermock-api-mockito:1.6.4'

compileOnly 'net.java.dev.javacc:javacc:6.1.2'
testImplementation 'net.java.dev.javacc:javacc:6.1.2'
compileOnly 'net.java.dev.javacc:javacc:7.0.12'
testImplementation 'net.java.dev.javacc:javacc:7.0.12'
}

eclipse {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ private Configuration createJavaccConfiguration(Project project) {

private void configureDefaultJavaccDependency(final Project project, Configuration configuration) {
configuration.defaultDependencies(dependencies ->
dependencies.add(project.getDependencies().create("net.java.dev.javacc:javacc:6.1.2")));
dependencies.add(project.getDependencies().create("net.java.dev.javacc:javacc:7.0.12")));
}

private void addCompileJavaccTaskToProject(Project project, Configuration configuration) {
Expand Down

0 comments on commit c74a825

Please sign in to comment.