-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into jdk9
* upstream/master: (184 commits) Try to update to gradle 5.0.2 (#4766) Post change notifications on JavaFX (#4871) fix missing l10n from previous merge fix compile error Fix right clicking on any entry and selecting "Open folder" results in the NullPointer exception (#4797) Bump fontbox from 2.0.14 to 2.0.15 (#4882) Bump pdfbox from 2.0.14 to 2.0.15 (#4881) Bump xmpbox from 2.0.14 to 2.0.15 (#4883) Bump mockito-core from 2.26.0 to 2.27.0 (#4879) Bump java-string-similarity from 1.1.0 to 1.2.1 (#4878) Fix JabRef dying silently without enough inotify instances (#4875) #4795 disable menu item if database not connected (#4828) Remove deprecated awt apple extension (#4860) Fix IllegalArgumentException when ranking entries (#4779) Bump junit-vintage-engine from 5.4.1 to 5.4.2 (#4866) Bump junit-platform-launcher from 1.4.1 to 1.4.2 (#4865) Bump junit-jupiter from 5.4.1 to 5.4.2 (#4867) Add author normalizer for medline import (#4863) Fixed group creation with default settings (#4801) removed default constructor of FXDialogService (#4847) ... # Conflicts: # build.gradle # src/main/java/org/jabref/gui/JabRefFrame.java # src/main/java/org/jabref/gui/collab/ChangeDisplayDialog.java # src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java
- Loading branch information
Showing
399 changed files
with
7,328 additions
and
16,044 deletions.
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
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
Binary file not shown.
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 |
---|---|---|
@@ -1,5 +1,5 @@ | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists |
Binary file not shown.
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
File renamed without changes
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 |
---|---|---|
@@ -0,0 +1,41 @@ | ||
name: jabref | ||
version: "git" | ||
version-script: cat build.gradle | grep "^version =" | cut -d'"' -f2 | ||
#icon: snap/gui/jabref.png | ||
summary: Bibliography manager | ||
description: JabRef is an open source bibliography reference manager. The native file format used by JabRef is BibTeX, the standard LaTeX bibliography format. | ||
|
||
grade: devel | ||
confinement: strict | ||
|
||
architectures: | ||
- build-on: amd64 | ||
- build-on: i386 | ||
|
||
apps: | ||
jabref: | ||
command: desktop-launch java -jar $SNAP/jar/JabRef-$SNAP_VERSION.jar | ||
environment: | ||
_JAVA_OPTIONS: "-Duser.home=$SNAP_USER_DATA" | ||
plugs: | ||
- desktop | ||
- desktop-legacy | ||
- wayland | ||
- unity7 | ||
- home | ||
- opengl | ||
- network-bind | ||
- removable-media | ||
|
||
parts: | ||
jabref: | ||
plugin: gradle | ||
source: . | ||
source-type: git | ||
stage-packages: | ||
- openjdk-8-jre | ||
- openjfx | ||
- x11-utils | ||
gradle-options: [snapJar, -xtest] | ||
gradle-output-dir: 'build/releases' | ||
after: [desktop-gtk2] |
Oops, something went wrong.