Update Gradle from 6.8.3 to 7.0 #7619

koppor · 2021-04-12T05:07:14Z

Update Gradle Wrapper from 6.8.3 to 7.0.

Read the release notes: https://docs.gradle.org/7.0/release-notes.html

The checksums of the Wrapper JAR and the distribution binary have been successfully verified.

Gradle release: 7.0
Distribution (-bin) zip checksum: eb8b89184261025b0430f5b2233701ff1377f96da1ef5e278af6ae8bac5cc305
Wrapper JAR Checksum: e996d452d2645e70c01c11143ca2d3742734a28da2bf61f25c82bdc288c9e637

You can find the reference checksum values at https://gradle.org/release-checksums/

🤖 This PR has been created by the Update Gradle Wrapper action.

Need help? 🤔

If something doesn't look right with this PR please file an issue here.

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

Siedlerchr · 2021-04-12T18:08:35Z

Depends on java9-modularity/gradle-modules-plugin#183

koppor · 2021-04-12T21:58:59Z

Getting the same error locally:

koppor@DESKTOP-KAK953S c:\git-repositories\jabref\jabref
$ set JAVA_HOME=C:\Program Files\AdoptOpenJDK\jdk-14.0.2.12-hotspot

koppor@DESKTOP-KAK953S c:\git-repositories\jabref\jabref
$ gradlew jlink
Starting a Gradle Daemon, 1 busy and 2 incompatible Daemons could not be reused, use --status for details

> Configure project :
Project : => 'org.jabref' Java module

> Task :compileJava
Skipped patching fastparse_2.12-1.0.0.jar into test
Skipped patching fastparse-utils_2.12-1.0.0.jar into test2
Skipped patching sourcecode_2.12-0.1.4.jar into test3
C:\git-repositories\jabref\jabref\src\main\java\org\jabref\gui\search\rules\describer\GrammarBasedSearchRuleDescriber.java:16: error: package org.jabref.search does not exist
import org.jabref.search.SearchBaseVisitor;
                        ^
C:\git-repositories\jabref\jabref\src\main\java\org\jabref\gui\search\rules\describer\GrammarBasedSearchRuleDescriber.java:17: error: package org.jabref.search does not exist
import org.jabref.search.SearchParser;
                        ^
C:\git-repositories\jabref\jabref\src\main\java\org\jabref\gui\search\rules\describer\GrammarBasedSearchRuleDescriber.java:48: error: cannot find symbol
    private class DescriptionSearchBaseVisitor extends SearchBaseVisitor<List<Text>> {
                                                       ^
  symbol:   class SearchBaseVisitor
  location: class GrammarBasedSearchRuleDescriber

koppor · 2021-04-12T22:03:45Z

As "usual" the duplicate usage of JournalAbbreviationLoader causes troubles. (buildSrc/src/main/groovy/org/jabref/build/JournalAbbreviationConverter.groovy) - Maybe, we should copy the source of that file to buildSrc/gen during the build?

oppor@DESKTOP-KAK953S c:\git-repositories\jabref\jabref
$ gradlew generateSearchGrammarSource
> Task :buildSrc:jar FAILED

FAILURE: Build failed with an exception.

* What went wrong:
Execution failed for task ':buildSrc:jar'.
> Entry org/jabref/build/JournalAbbreviationConverter$_convert_closure1$_closure2.class is a duplicate but no duplicate handling strategy has been set. Please refer to https://docs.gradle.org/7.0/dsl/org.gradle.api.file.CopySpec.html#org.gradle.api.file.CopySpec:duplicatesStrategy for details.

* Try:
Run with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output. Run with --scan to get full insights.

* Get more help at https://help.gradle.org

Deprecated Gradle features were used in this build, making it incompatible with Gradle 8.0.
Use '--warning-mode all' to show the individual deprecation warnings.
See https://docs.gradle.org/7.0/userguide/command_line_interface.html#sec:command_line_warnings

BUILD FAILED in 2s

Siedlerchr · 2021-04-13T06:15:06Z

I think it's something with this incremental build. If you execute gradlew generateSource locally again than it works

* upstream/main: Squashed 'buildres/csl/csl-styles/' changes from e1acabe..c363e8f (#7630) Update apple (#7628) update to JabRef e.V. apple certs (#7626)

Siedlerchr · 2021-04-16T18:23:22Z

maybe gradle/gradle#16409

* upstream/main: Bump checkstyle from 8.41.1 to 8.42 (#7668) Bump postgresql from 42.2.19 to 42.2.20 (#7670) Bump org.beryx.jlink from 2.23.6 to 2.23.7 (#7669) Fix exception when searching (#7659)

revert adding generate source

- Remove obsolete import org.gradle.work.DisableCachingByDefault - Empty lines to make plugin id comments more readable - Nicer Groovy code (= ;) Co-authored-by: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>

…adlew-update-7.0

Co-authored-by: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>

…adlew-update-7.0 * 'gradlew-update-7.0' of github.com:JabRef/jabref: Fix groovy Fix mavenCentral

Co-authored-by: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>

…adlew-update-7.0 # Conflicts: # buildSrc/build.gradle

…lasses to buildSrc

…ut as "src/" src-gen/main/java instead of src/main/generated

Siedlerchr · 2021-05-03T06:29:18Z

build.gradle

-    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" ]


Suggested change

args = ["-o", "src-gen/main/java/org/jabref/logic/bst/" , "$projectDir/src/main/antlr3/org/jabref/bst/Bst.g" ]

args = ["-o", "$projectDir/src-gen/main/java/org/jabref/logic/bst/" , "$projectDir/src/main/antlr3/org/jabref/bst/Bst.g" ]

It is not added to outputs.dir. To avoid cluttering the build.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.

Siedlerchr · 2021-05-03T06:29:37Z

build.gradle

-    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"]


Suggested change

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"]

args = ["-o","$projectDir/src-gen/main/java/org/jabref/search" , "-visitor", "-no-listener", "-package", "org.jabref.search", "$projectDir/src/main/antlr4/org/jabref/search/Search.g4"]

Siedlerchr · 2021-05-03T06:31:25Z

build.gradle

@@ -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")


Suggested change

options.annotationProcessorGeneratedSourcesDirectory = file("src-gen/main/java")

options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src-gen/main/java")

koppor · 2021-05-03T21:10:15Z

clean -> run/test works for me locally (IntelliJ/Mac OS X)

Strange thing -> on Windows, gradle executes the task buildSrc explicitely (and it is available). However, it is not available on WSL.

We decided to copy the .java classes into buildSrc to avoid confustion. We could also have added symlinks, but this is difficult on Windows.

koppor · 2021-05-03T21:34:03Z

Tested Windows build: runs

calixtus · 2021-05-03T21:35:06Z

Since this PR has seen multiple authors, there is no chance to get an unbiased review. So we are merging this now, to move forward (and because all tests are green).

* upstream/main: (354 commits) Fix ScienceDirect fetcher (#7684) Refactor NoBibTexFieldCheckerTest to increase mutation coverage (#7697) Update Gradle from 6.8.3 to 7.0 (#7619) Fixes Jabref#7305: the RFC fetcher is not compatible with the draftFix for issue 7305 (#7674) Refactoring existing unit tests (#7693) cover boundary cases & add more unit tests (#7694) Bump classgraph from 4.8.104 to 4.8.105 (#7688) Bump java-diff-utils from 4.9 to 4.10 (#7692) Fix arXiv fetcher tests (#7686) Make key for ScienceDirect configurable (#7683) migration of timestamp (#7671) Fix CCSB and DOAJ (#7426) [Bot] Update CSL styles (#7680) MS Office XML: Export month name (#7677) linkfix (#7678) readd fix (#7675) Fix threading cleanup in performSearch (#7672) add missing changelog delete bug fix (#7580) Add more unit tests to three gui classes (#7636) ... # Conflicts: # build.gradle

Update Gradle Wrapper from 6.8.3 to 7.0.

e09a9c9

Signed-off-by: gradle-update-robot <gradle-update-robot@regolo.cc>

koppor added dependencies Pull requests that update a dependency file gradle-wrapper Pull requests that update Gradle wrapper labels Apr 12, 2021

Siedlerchr added 4 commits April 12, 2021 08:26

fix gradle compile errors

25594e0

Merge branch 'main' into gradlew-update-7.0

d37d5f9

update cache workflows

b5e4a81

update cachem, rename key to gradle 7

ff0f558

koppor added 4 commits April 12, 2021 23:14

Try to fix compile issue

5849c32

Merge branch 'main' into gradlew-update-7.0

5916595

Update build.gradle

a1ff517

disable daemon and watch-fs

9dc446b

Siedlerchr added 2 commits April 16, 2021 19:47

Merge remote-tracking branch 'upstream/main' into gradlew-update-7.0

d172824

* upstream/main: Squashed 'buildres/csl/csl-styles/' changes from e1acabe..c363e8f (#7630) Update apple (#7628) update to JabRef e.V. apple certs (#7626)

try to use tasks register

64769ec

koppor and others added 8 commits April 17, 2021 17:07

Try to ensure source generation

f1b6a50

Merge branch 'main' into gradlew-update-7.0

37c6e1c

Add extension for compile to make jlink work

21585b4

try with new cache

7ea3496

Merge remote-tracking branch 'upstream/main' into gradlew-update-7.0

76a4715

* upstream/main: Bump checkstyle from 8.41.1 to 8.42 (#7668) Bump postgresql from 42.2.19 to 42.2.20 (#7670) Bump org.beryx.jlink from 2.23.6 to 2.23.7 (#7669) Fix exception when searching (#7659)

update modularity plugin

012dfb9

Try with org.javamodularity.moduleplugin:1.8.1

5b6e522

Remove quickfix

e756362

koppor changed the title ~~Update Gradle Wrapper from 6.8.3 to 7.0~~ Update Gradle from 6.8.3 to 7.0 May 2, 2021

Siedlerchr added 3 commits May 2, 2021 18:11

specify outputs dir and use modulary 1.8.2

01b53fb

dowmgrade plugin

858e5fb

Update deployment.yml

068cfdd

revert adding generate source

koppor and others added 15 commits May 2, 2021 22:24

Small code improvments

168b110

- Remove obsolete import org.gradle.work.DisableCachingByDefault - Empty lines to make plugin id comments more readable - Nicer Groovy code (= ;) Co-authored-by: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>

Merge branch 'gradlew-update-7.0' of github.com:JabRef/jabref into gr…

5c288d6

…adlew-update-7.0

Remove jcenter()

3630774

Merge remote-tracking branch 'origin/main' into gradlew-update-7.0

47b3ade

Fix mavenCentral

d192a7e

Co-authored-by: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>

Fix groovy

f14becd

Co-authored-by: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>

add maven central

b86837f

Merge branch 'gradlew-update-7.0' of github.com:JabRef/jabref into gr…

2f79358

…adlew-update-7.0 * 'gradlew-update-7.0' of github.com:JabRef/jabref: Fix groovy Fix mavenCentral

add maven central

5126721

Switch to mavenCentral

532596c

Improve readability

8b35c21

Co-authored-by: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>

Merge branch 'gradlew-update-7.0' of github.com:JabRef/jabref into gr…

7e6c623

…adlew-update-7.0 # Conflicts: # buildSrc/build.gradle

Resolve quirks with generateJournalAbbreviationList by copying java c…

aec1a20

…lasses to buildSrc

Refine documentation for buildSrc

ad66a8c

Generated sources flow into "src-gen/" directory having the same layo…

1b3a1fe

…ut as "src/" src-gen/main/java instead of src/main/generated

Siedlerchr reviewed May 3, 2021

View reviewed changes

Siedlerchr and others added 5 commits May 3, 2021 16:30

add checkstyle suppression

35ce3a6

fix markdownlint

295a62f

JabRef runs out ouf IntelliJ again

e42432e

Add some try-again hint

dd32aa0

Remove idea config block -> we do it manually

3f19cab

calixtus merged commit 382bc70 into main May 3, 2021

calixtus deleted the gradlew-update-7.0 branch May 3, 2021 21:35

koppor mentioned this pull request Aug 31, 2021

Switch from src-gen to src/main/generated #8044

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Gradle from 6.8.3 to 7.0 #7619

Update Gradle from 6.8.3 to 7.0 #7619

koppor commented Apr 12, 2021

Siedlerchr commented Apr 12, 2021

koppor commented Apr 12, 2021

koppor commented Apr 12, 2021

Siedlerchr commented Apr 13, 2021

Siedlerchr commented Apr 16, 2021

Siedlerchr May 3, 2021

koppor May 3, 2021

Siedlerchr May 3, 2021

Siedlerchr May 3, 2021

koppor commented May 3, 2021

koppor commented May 3, 2021

calixtus commented May 3, 2021

	args = ["-o", "src-gen/main/java/org/jabref/logic/bst/" , "$projectDir/src/main/antlr3/org/jabref/bst/Bst.g" ]
	args = ["-o", "$projectDir/src-gen/main/java/org/jabref/logic/bst/" , "$projectDir/src/main/antlr3/org/jabref/bst/Bst.g" ]

	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"]
	args = ["-o","$projectDir/src-gen/main/java/org/jabref/search" , "-visitor", "-no-listener", "-package", "org.jabref.search", "$projectDir/src/main/antlr4/org/jabref/search/Search.g4"]

	options.annotationProcessorGeneratedSourcesDirectory = file("src-gen/main/java")
	options.annotationProcessorGeneratedSourcesDirectory = file("${projectDir}/src-gen/main/java")

Update Gradle from 6.8.3 to 7.0 #7619

Update Gradle from 6.8.3 to 7.0 #7619

Conversation

koppor commented Apr 12, 2021

Siedlerchr commented Apr 12, 2021

koppor commented Apr 12, 2021

koppor commented Apr 12, 2021

Siedlerchr commented Apr 13, 2021

Siedlerchr commented Apr 16, 2021

Siedlerchr May 3, 2021

Choose a reason for hiding this comment

koppor May 3, 2021

Choose a reason for hiding this comment

Siedlerchr May 3, 2021

Choose a reason for hiding this comment

Siedlerchr May 3, 2021

Choose a reason for hiding this comment

koppor commented May 3, 2021

koppor commented May 3, 2021

calixtus commented May 3, 2021