Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update gradle from 6.3 to 6.5.1 #6431

Closed
wants to merge 8 commits into from
Closed

Update gradle from 6.3 to 6.5.1 #6431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b3dd1cd
Update gradle from 6.3 to 6.4
koppor May 6, 2020
8cd69cc
Merge remote-tracking branch 'upstream/master' into udpate-gradle-to-64
Siedlerchr May 16, 2020
0ec7214
update to setMain
Siedlerchr May 16, 2020
954b93c
setmain in configure
Siedlerchr May 16, 2020
68f7a68
Merge branch 'master' into udpate-gradle-to-64
koppor Jun 16, 2020
0487fc1
Update from gradle 6.4 to gradle 6.5
koppor Jun 16, 2020
f507a9a
Update to 6.5.1
koppor Jul 20, 2020
b6580e2
Merge remote-tracking branch 'origin/master' into udpate-gradle-to-64
koppor Jul 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions buildSrc/src/main/groovy/org/jabref/build/antlr/AntlrTask.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.jabref.build.antlr

import org.gradle.api.Task
import org.gradle.api.tasks.JavaExec
import org.gradle.api.tasks.TaskAction

Expand All @@ -12,6 +13,7 @@ class AntlrTask extends JavaExec {
private String inputFile = ""
private String outputDir = ""
private String javaPackage = ""
private AntlrCommandLine commandLine

AntlrTask() {
project.configurations {
Expand All @@ -20,13 +22,19 @@ class AntlrTask extends JavaExec {
}
}

@Override
Task configure(Closure closure) {
commandLine = antlr.newInstance(this)

setMain(commandLine.main)

return super.configure(closure)
}

@TaskAction
@Override
void exec() {
AntlrCommandLine commandLine = antlr.newInstance(this)

main = commandLine.main
classpath = commandLine.classpath
classpath(commandLine.classpath)
args = commandLine.arguments

super.exec()
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists