-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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.
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.8.3 to 7.0 #7619
Merged
Merged
Changes from 2 commits
Commits
Show all changes
50 commits
Select commit
Hold shift + click to select a range
e09a9c9
Update Gradle Wrapper from 6.8.3 to 7.0.
gradle-update-robot 25594e0
fix gradle compile errors
Siedlerchr d37d5f9
Merge branch 'main' into gradlew-update-7.0
Siedlerchr b5e4a81
update cache workflows
Siedlerchr ff0f558
update cachem, rename key to gradle 7
Siedlerchr 5849c32
Try to fix compile issue
koppor 5916595
Merge branch 'main' into gradlew-update-7.0
koppor a1ff517
Update build.gradle
koppor 9dc446b
disable daemon and watch-fs
koppor d172824
Merge remote-tracking branch 'upstream/main' into gradlew-update-7.0
Siedlerchr 64769ec
try to use tasks register
Siedlerchr f1b6a50
Try to ensure source generation
koppor 37c6e1c
Merge branch 'main' into gradlew-update-7.0
Siedlerchr 21585b4
Add extension for compile to make jlink work
Siedlerchr 7ea3496
try with new cache
Siedlerchr 76a4715
Merge remote-tracking branch 'upstream/main' into gradlew-update-7.0
Siedlerchr 012dfb9
update modularity plugin
Siedlerchr 5b6e522
Try with org.javamodularity.moduleplugin:1.8.1
koppor e756362
Remove quickfix
koppor 01b53fb
specify outputs dir and use modulary 1.8.2
Siedlerchr 858e5fb
dowmgrade plugin
Siedlerchr 068cfdd
Update deployment.yml
Siedlerchr 4adaa3f
add duplicate strategy exclude
Siedlerchr 3635513
Merge branch 'gradlew-update-7.0' of github.com:JabRef/jabref into gr…
Siedlerchr 69b3682
set inferModularity to false
Siedlerchr 1f37009
Fix empty lines
koppor d351505
Fix empty lines
koppor 398875a
Fix empty line
koppor 7b63bbc
Disable full strack traces ALWAYS
koppor 2ae05b9
add duplicate strategy
Siedlerchr 168b110
Small code improvments
koppor 5c288d6
Merge branch 'gradlew-update-7.0' of github.com:JabRef/jabref into gr…
koppor 3630774
Remove jcenter()
koppor 47b3ade
Merge remote-tracking branch 'origin/main' into gradlew-update-7.0
koppor d192a7e
Fix mavenCentral
koppor f14becd
Fix groovy
koppor b86837f
add maven central
Siedlerchr 2f79358
Merge branch 'gradlew-update-7.0' of github.com:JabRef/jabref into gr…
Siedlerchr 5126721
add maven central
Siedlerchr 532596c
Switch to mavenCentral
koppor 8b35c21
Improve readability
koppor 7e6c623
Merge branch 'gradlew-update-7.0' of github.com:JabRef/jabref into gr…
koppor aec1a20
Resolve quirks with generateJournalAbbreviationList by copying java c…
koppor ad66a8c
Refine documentation for buildSrc
koppor 1b3a1fe
Generated sources flow into "src-gen/" directory having the same layo…
koppor 35ce3a6
add checkstyle suppression
Siedlerchr 295a62f
fix markdownlint
Siedlerchr e42432e
JabRef runs out ouf IntelliJ again
koppor dd32aa0
Add some try-again hint
koppor 3f19cab
Remove idea config block -> we do it manually
koppor File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -33,6 +33,8 @@ plugins { | |||||
id 'checkstyle' | ||||||
|
||||||
id 'project-report' | ||||||
|
||||||
id 'idea' | ||||||
} | ||||||
|
||||||
// Enable following for debugging | ||||||
|
@@ -72,9 +74,9 @@ modularity.disableEffectiveArgumentsAdjustment() | |||||
sourceSets { | ||||||
main { | ||||||
java { | ||||||
srcDirs = ["src/main/java", "src/main/generated"] | ||||||
// src-gen reasoning: https://stackoverflow.com/a/64612308/873282 | ||||||
srcDirs = ["src/main/java", "src-gen/main/java"] | ||||||
} | ||||||
|
||||||
resources { | ||||||
srcDirs = ["src/main/java", "src/main/resources"] | ||||||
} | ||||||
|
@@ -274,6 +276,7 @@ task checkOutdatedDependencies(dependsOn: dependencyUpdates) { | |||||
|
||||||
clean { | ||||||
delete "src/main/generated" | ||||||
delete "src-gen" | ||||||
} | ||||||
|
||||||
processResources { | ||||||
|
@@ -322,8 +325,8 @@ tasks.register("generateBstGrammarSource", JavaExec) { | |||||
description = 'Generates BstLexer.java and BstParser.java from the Bst.g grammar file using antlr3.' | ||||||
|
||||||
inputs.dir('src/main/antlr3/org/jabref/bst/') | ||||||
outputs.dir("src/main/generated/org/jabref/logic/bst/") | ||||||
args = ["-o", "$projectDir/src/main/generated/org/jabref/logic/bst/" , "$projectDir/src/main/antlr3/org/jabref/bst/Bst.g" ] | ||||||
outputs.dir("src-gen/main/java/org/jabref/logic/bst/") | ||||||
args = ["-o", "src-gen/main/java/org/jabref/logic/bst/" , "$projectDir/src/main/antlr3/org/jabref/bst/Bst.g" ] | ||||||
} | ||||||
|
||||||
tasks.register("generateSearchGrammarSource", JavaExec) { | ||||||
|
@@ -333,16 +336,16 @@ tasks.register("generateSearchGrammarSource", JavaExec) { | |||||
description = "Generates java files for Search.g antlr4." | ||||||
|
||||||
inputs.dir("src/main/antlr4/org/jabref/search/") | ||||||
outputs.dir("src/main/generated/org/jabref/search/") | ||||||
args = ["-o","$projectDir/src/main/generated/org/jabref/search" , "-visitor", "-no-listener", "-package", "org.jabref.search", "$projectDir/src/main/antlr4/org/jabref/search/Search.g4"] | ||||||
outputs.dir("src-gen/main/java/org/jabref/search/") | ||||||
args = ["-o","src-gen/main/java/org/jabref/search" , "-visitor", "-no-listener", "-package", "org.jabref.search", "$projectDir/src/main/antlr4/org/jabref/search/Search.g4"] | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
} | ||||||
|
||||||
task generateMedlineSource(type: XjcTask) { | ||||||
group = 'JabRef' | ||||||
description = "Generates java files for the medline importer." | ||||||
|
||||||
schemaFile = "src/main/resources/xjc/medline/medline.xsd" | ||||||
outputDirectory = "src/main/generated" | ||||||
outputDirectory = "src-gen/main/java" | ||||||
javaPackage = "org.jabref.logic.importer.fileformat.medline" | ||||||
} | ||||||
|
||||||
|
@@ -351,7 +354,7 @@ task generateBibtexmlSource(type: XjcTask) { | |||||
description = "Generates java files for the bibtexml importer." | ||||||
|
||||||
schemaFile = "src/main/resources/xjc/bibtexml/bibtexml.xsd" | ||||||
outputDirectory = "src/main/generated/" | ||||||
outputDirectory = "src-gen/main/java/" | ||||||
javaPackage = "org.jabref.logic.importer.fileformat.bibtexml" | ||||||
} | ||||||
|
||||||
|
@@ -360,7 +363,7 @@ task generateEndnoteSource(type: XjcTask) { | |||||
description = "Generates java files for the endnote importer." | ||||||
|
||||||
schemaFile = "src/main/resources/xjc/endnote/endnote.xsd" | ||||||
outputDirectory = "src/main/generated/" | ||||||
outputDirectory = "src-gen/main/java/" | ||||||
javaPackage = "org.jabref.logic.importer.fileformat.endnote" | ||||||
} | ||||||
|
||||||
|
@@ -370,7 +373,7 @@ task generateModsSource(type: XjcTask) { | |||||
|
||||||
schemaFile = "src/main/resources/xjc/mods/mods-3-7.xsd" | ||||||
bindingFile = "src/main/resources/xjc/mods/mods-binding.xjb" | ||||||
outputDirectory = "src/main/generated/" | ||||||
outputDirectory = "src-gen/main/java" | ||||||
javaPackage = "org.jabref.logic.importer.fileformat.mods" | ||||||
arguments = '-npa' | ||||||
} | ||||||
|
@@ -394,7 +397,7 @@ compileJava { | |||||
options.compilerArgs << "-Xlint:none" | ||||||
dependsOn "generateSource" | ||||||
|
||||||
options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src/main/generated") | ||||||
options.annotationProcessorGeneratedSourcesDirectory = file("src-gen/main/java") | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
|
||||||
moduleOptions { | ||||||
// TODO: Remove access to internal api | ||||||
|
@@ -776,3 +779,11 @@ task downloadDependencies { | |||||
} | ||||||
} | ||||||
} | ||||||
|
||||||
idea { | ||||||
module { | ||||||
// documentation: https://docs.gradle.org/current/dsl/org.gradle.plugins.ide.idea.model.IdeaModule.html | ||||||
generatedSourceDirs += file("src-gen/main/java") | ||||||
downloadJavadoc = true | ||||||
} | ||||||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is not added to
outputs.dir
. To avoid cluttering thebuild.gradle
file, I would leave this change out and "just" use the relative path. (And it works with the relative path).I'll keep it in my head though.