diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index bec5380f3d1..49eae5fb82f 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -34,6 +34,14 @@ jobs: with: depth: 1 submodules: true + - name: Extract branch name + shell: bash + run: | + ref=${GITHUB_REF#refs/heads/} + ref=${ref#refs/pull/} + ref=${ref%/merge} + echo "##[set-output name=branch;]${ref}" + id: extract_branch - name: Set up JDK uses: actions/setup-java@v1 with: @@ -75,10 +83,14 @@ jobs: - name: Package application image run: ${{ matrix.archivePortable }} shell: bash - - name: Extract branch name + - name: Build and publish snap + if: matrix.os == 'ubuntu-latest' && steps.extract_branch.outputs.branch == 'master' + env: + SNAPCRAFT_LOGIN_FILE: ${{ secrets.SNAPCRAFT_LOGIN_FILE }} + run: | + docker run -v $(pwd):$(pwd) -t lyzardking/snapcraft-bionic sh -c "apt update -qq && cd $(pwd) && snapcraft && mv jabref*.snap build/distribution/" + # cd build/distribution/ && mdkir .snapcraft && echo ${SNAPCRAFT_LOGIN_FILE} | base64 --decode --ignore-garbage > .snapcraft/snapcraft.cfg && snapcraft push --release=beta *.snap shell: bash - run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})" - id: extract_branch - name: Upload to builds.jabref.org uses: garygrossgarten/github-action-scp@release with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 36fb284eccb..176f00a3e26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `# ### Changed -- We added a short DOI field formatter which shortens DOI to more human readable form. [koppor#343](https://github.com/koppor/jabref/issues/343) +- We added a short DOI field formatter which shortens DOI to more human-readable form. [koppor#343](https://github.com/koppor/jabref/issues/343) - We improved the display of group memberships by adding multiple colored bars if the entry belongs to more than one group. [#4574](https://github.com/JabRef/jabref/issues/4574) ### Fixed @@ -31,9 +31,9 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `# - We fixed an error where the default color of a new group was white instead of dark gray. [#4868](https://github.com/JabRef/jabref/issues/4868) - We fixed an error mentioning "javafx.controls/com.sun.javafx.scene.control" that was thrown when interacting with the toolbar. - We fixed an error where a cleared search was restored after switching libraries. [#4846](https://github.com/JabRef/jabref/issues/4846) -- We fixed an exception which occured when trying to open a non existing file from the "Recent files"-menu [#5334](https://github.com/JabRef/jabref/issues/5334) +- We fixed an exception which occurred when trying to open a non-existing file from the "Recent files"-menu [#5334](https://github.com/JabRef/jabref/issues/5334) - The context menu for fields in the entry editor is back. [#5254](https://github.com/JabRef/jabref/issues/5254) -- We fixed an exception which occurred when trying to open a non existing file from the "Recent files"-menu [#5334](https://github.com/JabRef/jabref/issues/5334) +- We fixed an exception which occurred when trying to open a non-existing file from the "Recent files"-menu [#5334](https://github.com/JabRef/jabref/issues/5334) - We fixed a problem where the "editor" information has been duplicated during saving a .bib-Database. [#5359](https://github.com/JabRef/jabref/issues/5359) - We re-introduced the feature to switch between different preview styles. [#5221](https://github.com/JabRef/jabref/issues/5221) - We fixed various issues (including [#5263](https://github.com/JabRef/jabref/issues/5263)) related to copying entries to the clipboard @@ -108,11 +108,11 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `# - Moreover, empty deprecated fields are no longer shown - Added server timezone parameter when connecting to a shared database. - We updated the dialog for setting up general fields. -- URL field formatting is updated. All whitespace chars, located at the beginning/ending of the url, are trimmed automatically +- URL field formatting is updated. All whitespace chars, located at the beginning/ending of the URL, are trimmed automatically - We changed the behavior of the field formatting dialog such that the `bibtexkey` is not changed when formatting all fields or all text fields. - We added a "Move file to file directory and rename file" option for simultaneously moving and renaming of document file. [#4166](https://github.com/JabRef/jabref/issues/4166) - Use integrated graphics card instead of discrete on macOS [#4070](https://github.com/JabRef/jabref/issues/4070) -- We added a cleanup operation that detects an arXiv identifier in the note, journal or url field and moves it to the `eprint` field. +- We added a cleanup operation that detects an arXiv identifier in the note, journal or URL field and moves it to the `eprint` field. Because of this change, the last-used cleanup operations were reset. - We changed the minimum required version of Java to 1.8.0_171, as this is the latest release for which the automatic Java update works. [#4093](https://github.com/JabRef/jabref/issues/4093) - The special fields like `Printed` and `Read status` now show gray icons when the row is hovered. @@ -131,18 +131,19 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `# - Files without a defined external file type are now directly opened with the default application of the operating system - We streamlined the process to rename and move files by removing the confirmation dialogs. - We removed the redundant new lines of markings and wrapped the summary in the File annotation tab. [#3823](https://github.com/JabRef/jabref/issues/3823) -- We add auto url formatting when user paste link to URL field in entry editor. [koppor#254](https://github.com/koppor/jabref/issues/254) -- We added a minimal height for the entry editor so that it can no longer be hidden by accident. [#4279](https://github.com/JabRef/jabref/issues/4279) +- We add auto URL formatting when user paste link to URL field in entry editor. [koppor#254](https://github.com/koppor/jabref/issues/254) +- We added a minimum height for the entry editor so that it can no longer be hidden by accident. [#4279](https://github.com/JabRef/jabref/issues/4279) - We added a new keyboard shortcut so that the entry editor could be closed by Ctrl + E. [#4222] (https://github.com/JabRef/jabref/issues/4222) - We added an option in the preference dialog box, that allows user to pick the dark or light theme option. [#4130] (https://github.com/JabRef/jabref/issues/4130) -- We updated updated the Related Articles tab to accept JSON from the new version of the Mr. DLib service +- We updated the Related Articles tab to accept JSON from the new version of the Mr. DLib service - We added an option in the preference dialog box that allows user to choose behavior after dragging and dropping files in Entry Editor. [#4356](https://github.com/JabRef/jabref/issues/4356) - We added the ability to have an export preference where previously "File"-->"Export"/"Export selected entries" would not save the user's preference[#4495](https://github.com/JabRef/jabref/issues/4495) - We optimized the code responsible for connecting to an external database, which should lead to huge improvements in performance. - For automatically created groups, added ability to filter groups by entry type. [#4539](https://github.com/JabRef/jabref/issues/4539) - We added the ability to add field names from the Preferences Dialog [#4546](https://github.com/JabRef/jabref/issues/4546) -- We added the ability change the column widths directly in the main table. [#4546](https://github.com/JabRef/jabref/issues/4546) -- We added description of how recommendations where chosen and better error handling to Related Articles tab +- We added the ability to change the column widths directly in the main +. [#4546](https://github.com/JabRef/jabref/issues/4546) +- We added a description of how recommendations were chosen and better error handling to Related Articles tab - We added the ability to execute default action in dialog by using with Ctrl + Enter combination [#4496](https://github.com/JabRef/jabref/issues/4496) - We grouped and reordered the Main Menu (File, Edit, Library, Quality, Tools, and View tabs & icons). [#4666](https://github.com/JabRef/jabref/issues/4666) [#4667](https://github.com/JabRef/jabref/issues/4667) [#4668](https://github.com/JabRef/jabref/issues/4668) [#4669](https://github.com/JabRef/jabref/issues/4669) [#4670](https://github.com/JabRef/jabref/issues/4670) [#4671](https://github.com/JabRef/jabref/issues/4671) [#4672](https://github.com/JabRef/jabref/issues/4672) [#4673](https://github.com/JabRef/jabref/issues/4673) - We added additional modifiers (capitalize, titlecase and sentencecase) to the Bibtex key generator. [#1506](https://github.com/JabRef/jabref/issues/1506) @@ -151,7 +152,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `# - We added a browse button next to the path text field for aux-based groups. [#4586](https://github.com/JabRef/jabref/issues/4586) - We changed the title of Group Dialog to "Add subgroup" from "Edit group" when we select Add subgroup option. - We enable import button only if entries are selected. [#4755](https://github.com/JabRef/jabref/issues/4755) -- We made modifications to improve contrast of UI elements. [#4583](https://github.com/JabRef/jabref/issues/4583) +- We made modifications to improve the contrast of UI elements. [#4583](https://github.com/JabRef/jabref/issues/4583) - We added a warning for empty BibTeX keys in the entry editor. [#4440](https://github.com/JabRef/jabref/issues/4440) - We added an option in the settings to set the default action in JabRef when right clicking on any entry in any database and selecting "Open folder". [#4763](https://github.com/JabRef/jabref/issues/4763) - The Medline fetcher now normalizes the author names according to the BibTeX-Standard [#4345](https://github.com/JabRef/jabref/issues/4345) @@ -178,7 +179,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `# - We fixed an issue where the group tree was not updated correctly after an entry was changed. https://github.com/JabRef/jabref/issues/3618 - We fixed an issue where a right-click in the main table selected a wrong entry. https://github.com/JabRef/jabref/issues/3267 - We fixed an issue where in rare cases entries where overlayed in the main table. https://github.com/JabRef/jabref/issues/3281 -- We fixed an issue where selecting a group messed up the focus of the main table / entry editor. https://github.com/JabRef/jabref/issues/3367 +- We fixed an issue where selecting a group messed up the focus of the main table and the entry editor. https://github.com/JabRef/jabref/issues/3367 - We fixed an issue where composite author names were sorted incorrectly. https://github.com/JabRef/jabref/issues/2828 - We fixed an issue where commands followed by `-` didn't work. [#3805](https://github.com/JabRef/jabref/issues/3805) - We fixed an issue where a non-existing aux file in a group made it impossible to open the library. [#4735](https://github.com/JabRef/jabref/issues/4735) @@ -211,9 +212,9 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `# - We fixed an issue where "Move to group" would always move the first entry in the library and not the selected [#4414](https://github.com/JabRef/jabref/issues/4414) - We fixed an issue where an older dialog appears when downloading full texts from the quality menu. [#4489](https://github.com/JabRef/jabref/issues/4489) - We fixed an issue where right clicking on any entry in any database and selecting "Open folder" results in the NullPointer exception. [#4763](https://github.com/JabRef/jabref/issues/4763) -- We fixed an issue where option 'open terminal here' with custom command was passing wrong argument. [#4802](https://github.com/JabRef/jabref/issues/4802) +- We fixed an issue where option 'open terminal here' with custom command was passing the wrong argument. [#4802](https://github.com/JabRef/jabref/issues/4802) - We fixed an issue where ranking an entry would generate an IllegalArgumentException. [#4754](https://github.com/JabRef/jabref/issues/4754) -- We fixed an issue where special characters where removed from non label key generation pattern parts [#4767](https://github.com/JabRef/jabref/issues/4767) +- We fixed an issue where special characters where removed from non-label key generation pattern parts [#4767](https://github.com/JabRef/jabref/issues/4767) - We fixed an issue where the RIS import would overwite the article date with the value of the acessed date [#4816](https://github.com/JabRef/jabref/issues/4816) - We fixed an issue where an NullPointer exception was thrown when a referenced entry in an Open/Libre Office document was no longer present in the library. Now an error message with the reference marker of the missing entry is shown. [#4932](https://github.com/JabRef/jabref/issues/4932) - We fixed an issue where a database exception related to a missing timezone was too big. [#4827](https://github.com/JabRef/jabref/issues/4827) @@ -229,13 +230,13 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `# - The feature to "mark entries" was removed and merged with the groups functionality. For migration, a group is created for every value of the `__markedentry` field and the entry is added to this group. - The number column was removed. - We removed the global search feature. -- We removed the coloring of cells in the maintable according to whether the field is optional/required. +- We removed the coloring of cells in the main table according to whether the field is optional/required. - We removed the feature to find and resolve duplicate BibTeX keys (as this use case is already covered by the integrity check). - We removed a few commands from the right-click menu that are not needed often and thus don't need to be placed that prominently: - Print entry preview: available through entry preview - All commands related to marking: marking is not yet reimplemented - Set/clear/append/rename fields: available through Edit menu - - Manage keywords: available through Edit menu + - Manage keywords: available through the Edit menu - Copy linked files to folder: available through File menu - Add/move/remove from group: removed completely (functionality still available through group interface) - We removed the option to change the column widths in the preferences dialog. [#4546](https://github.com/JabRef/jabref/issues/4546) diff --git a/build.gradle b/build.gradle index 6c2718ba43a..5f89d05c7d0 100644 --- a/build.gradle +++ b/build.gradle @@ -138,7 +138,7 @@ dependencies { antlr4 'org.antlr:antlr4:4.7.2' compile 'org.antlr:antlr4-runtime:4.7.2' - compile group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.4.4' + compile group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.5.0' compile 'org.postgresql:postgresql:42.2.8' @@ -164,9 +164,10 @@ dependencies { compile 'org.jsoup:jsoup:1.12.1' compile 'com.mashape.unirest:unirest-java:1.4.9' - compile 'org.slf4j:slf4j-api:2.0.0-alpha0' + compile 'org.slf4j:slf4j-api:2.0.0-alpha1' compile group: 'org.apache.logging.log4j', name: 'log4j-jcl', version: '3.0.0-20190915.182410-364' compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j18-impl', version: '3.0.0-20190915.182922-250' + compile group: 'org.apache.logging.log4j', name: 'log4j-plugins', version: '3.0.0-20190915.182837-57' implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '3.0.0-20190915.182113-372' compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-20190915.182215-368' annotationProcessor group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-20190915.182215-368' @@ -205,7 +206,7 @@ dependencies { testCompile 'net.bytebuddy:byte-buddy-parent:1.10.1' testRuntime group: 'org.apache.logging.log4j', name: 'log4j-core', version: '3.0.0-20190915.182215-368' testRuntime group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '3.0.0-20190915.182552-364' - testCompile 'org.mockito:mockito-core:3.0.0' + testCompile 'org.mockito:mockito-core:3.1.0' //testCompile 'com.github.tomakehurst:wiremock:2.24.1' testCompile ('org.reflections:reflections:0.9.11') { exclude module: "jsr305" diff --git a/snap/plugins/x_gradle.py b/snap/plugins/x_gradle.py deleted file mode 100644 index 899d6567712..00000000000 --- a/snap/plugins/x_gradle.py +++ /dev/null @@ -1,301 +0,0 @@ -# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*- -# -# Copyright (C) 2016, 2018 Canonical Ltd -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 3 as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -"""This plugin is useful for building parts that use gradle. - -The gradle build system is commonly used to build Java projects. -The plugin requires a pom.xml in the root of the source tree. - -This plugin uses the common plugin keywords as well as those for "sources". -For more information check the 'plugins' topic for the former and the -'sources' topic for the latter. - -Additionally, this plugin uses the following plugin-specific keywords: - - - gradle-options: - (list of strings) - Flags to pass to the build using the gradle semantics for parameters. - The 'jar' option is always passed in as the last parameter. - - - gradle-output-dir: - (string; default: 'build/libs') - The output directory where the resulting jar or war files from gradle[w] - are generated. - - - gradle-version: - (string) - The version of gradle you want to use to build the source artifacts. - Defaults to the current release downloadable from - https://services.gradle.org/distributions/ - The entry is ignored if gradlew is found. - - - gradle-version-checksum: - (string) - The checksum for gradle-version in the form of /. - As an example "sha512/2a803f578f341e164f6753e410413d16ab60fab...". - - - gradle-openjdk-version: - (string) - openjdk version available to the base to use. If not set the latest - version available to the base will be used. -""" - -import logging -import os -import urllib.parse -from glob import glob -from typing import Sequence - -import snapcraft -from snapcraft import file_utils, formatting_utils -from snapcraft.internal import errors, sources - -logger = logging.getLogger(__name__) - - -_DEFAULT_GRADLE_VERSION = "4.10.2" -_DEFAULT_GRADLE_CHECKSUM = ( - "sha256/b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29" -) -_GRADLE_URL = "https://services.gradle.org/distributions/gradle-{version}-bin.zip" - - -class UnsupportedJDKVersionError(errors.SnapcraftError): - - fmt = ( - "The gradle-openjdk-version plugin property was set to {version!r}.\n" - "Valid values for the {base!r} base are: {valid_versions}." - ) - - def __init__( - self, *, base: str, version: str, valid_versions: Sequence[str] - ) -> None: - super().__init__( - base=base, - version=version, - valid_versions=formatting_utils.humanize_list( - valid_versions, conjunction="or" - ), - ) - - -class GradlePlugin(snapcraft.BasePlugin): - @classmethod - def schema(cls): - schema = super().schema() - schema["properties"]["gradle-options"] = { - "type": "array", - "minitems": 1, - "uniqueItems": True, - "items": {"type": "string"}, - "default": [], - } - schema["properties"]["gradle-output-dir"] = { - "type": "string", - "default": "build/libs", - } - - schema["properties"]["gradle-version"] = {"type": "string"} - - schema["properties"]["gradle-version-checksum"] = {"type": "string"} - - schema["properties"]["gradle-openjdk-version"] = { - "type": "string", - "default": "", - } - - schema["required"] = ["source"] - - return schema - - @classmethod - def get_pull_properties(cls): - # Inform Snapcraft of the properties associated with pulling. If these - # change in the YAML Snapcraft will consider the pull step dirty. - return ["gradle-version", "gradle-version-checksum", "gradle-openjdk-version"] - - @classmethod - def get_build_properties(cls): - # Inform Snapcraft of the properties associated with building. If these - # change in the YAML Snapcraft will consider the build step dirty. - return super().get_build_properties() + ["gradle-options", "gradle-output-dir"] - - @property - def _gradle_tar(self): - if self._gradle_tar_handle is None: - gradle_uri = _GRADLE_URL.format(version=self._gradle_version) - self._gradle_tar_handle = sources.Zip( - gradle_uri, self._gradle_dir, source_checksum=self._gradle_checksum - ) - return self._gradle_tar_handle - - def __init__(self, name, options, project): - super().__init__(name, options, project) - - self._setup_gradle() - self._setup_base_tools(project.info.get_build_base()) - - def _setup_base_tools(self, base): - if base not in ("core", "core16", "core18"): - raise errors.PluginBaseError( - part_name=self.name, base=self.project.info.get_build_base() - ) - - if base in ("core", "core16"): - valid_versions = ["8", "9"] - elif base == "core18": - valid_versions = ["8", "11"] - - version = self.options.gradle_openjdk_version - if not version: - version = valid_versions[-1] - elif version not in valid_versions: - raise UnsupportedJDKVersionError( - version=version, base=base, valid_versions=valid_versions - ) - - self.stage_packages.append("openjdk-{}-jre-headless".format(version)) - self.build_packages.append("openjdk-{}-jdk-headless".format(version)) - self.build_packages.append("ca-certificates-java") - self._java_version = version - - def _using_gradlew(self) -> bool: - return os.path.isfile(os.path.join(self.sourcedir, "gradlew")) - - def _setup_gradle(self): - self._gradle_tar_handle = None - self._gradle_dir = os.path.join(self.partdir, "gradle") - if self.options.gradle_version: - self._gradle_version = self.options.gradle_version - self._gradle_checksum = self.options.gradle_version_checksum - else: - self._gradle_version = _DEFAULT_GRADLE_VERSION - self._gradle_checksum = _DEFAULT_GRADLE_CHECKSUM - - def pull(self): - super().pull() - - if self._using_gradlew(): - logger.info("Found gradlew, skipping gradle setup.") - return - - os.makedirs(self._gradle_dir, exist_ok=True) - self._gradle_tar.download() - - def build(self): - super().build() - - if self._using_gradlew(): - gradle_cmd = ["./gradlew"] - else: - self._gradle_tar.provision(self._gradle_dir, keep_zip=True) - gradle_cmd = ["gradle"] - self.run( - gradle_cmd - + self._get_proxy_options() - + self.options.gradle_options, - rootdir=self.builddir, - ) - - src = os.path.join(self.builddir, self.options.gradle_output_dir) - basedir = "jabref" - # jarfiles = glob(os.path.join(src, "*.jar")) - # warfiles = glob(os.path.join(src, "*.war")) - - # if len(jarfiles) > 0: - # basedir = "jar" - # elif len(warfiles) > 0: - # basedir = "war" - # jarfiles = warfiles - # else: - # raise RuntimeError("Could not find any built jar files for part") - - file_utils.link_or_copy_tree( - src, - os.path.join(self.installdir, basedir), - copy_function=lambda src, dst: file_utils.link_or_copy( - src, dst, self.installdir - ), - ) - - self._create_symlinks() - - def _create_symlinks(self): - if self.project.info.get_build_base() not in ("core18", "core16", "core"): - raise errors.PluginBaseError( - part_name=self.name, base=self.project.info.get_build_base() - ) - - os.makedirs(os.path.join(self.installdir, "bin"), exist_ok=True) - java_bin = glob( - os.path.join( - self.installdir, - "usr", - "lib", - "jvm", - "java-{}-openjdk-*".format(self._java_version), - "bin", - "java", - ) - )[0] - os.symlink( - os.path.relpath(java_bin, os.path.join(self.installdir, "bin")), - os.path.join(self.installdir, "bin", "java"), - ) - - def run(self, cmd, rootdir): - super().run(cmd, cwd=rootdir, env=self._build_environment()) - - def _build_environment(self): - if self._using_gradlew(): - return - - env = os.environ.copy() - gradle_bin = os.path.join( - self._gradle_dir, "gradle-{}".format(self._gradle_version), "bin" - ) - print(gradle_bin) - - if env.get("PATH"): - new_path = "{}:{}".format(gradle_bin, env.get("PATH")) - else: - new_path = gradle_bin - - env["PATH"] = new_path - return env - - def _get_proxy_options(self): - proxy_options = [] - for var in ("http", "https"): - proxy = os.environ.get("{}_proxy".format(var), False) - if proxy: - parsed_url = urllib.parse.urlparse(proxy) - proxy_options.append( - "-D{}.proxyHost={}".format(var, parsed_url.hostname) - ) - if parsed_url.port: - proxy_options.append( - "-D{}.proxyPort={}".format(var, parsed_url.port) - ) - if parsed_url.username: - proxy_options.append( - "-D{}.proxyUser={}".format(var, parsed_url.username) - ) - if parsed_url.password: - proxy_options.append( - "-D{}.proxyPassword={}".format(var, parsed_url.password) - ) - return proxy_options diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index b62d2d571e3..a60eadd2d4d 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,7 +1,9 @@ name: jabref -version: "git" +# adopt-info: jabref +version: 'master' version-script: cat build.gradle | grep "^version =" | cut -d'"' -f2 -#icon: snap/gui/jabref.png +icon: snap/gui/jabref.png +license: MIT 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. @@ -14,11 +16,10 @@ architectures: apps: jabref: - command: desktop-launch $SNAP/jabref/bin/JabRefMain + command: bin/JabRef + extensions: [gnome-3-28] environment: _JAVA_OPTIONS: "-Duser.home=$SNAP_USER_DATA" - XDG_DATA_DIRS: $SNAP/share:$XDG_DATA_DIRS - GSETTINGS_SCHEMA_DIR: $SNAP/share/glib-2.0/schemas plugs: - desktop - desktop-legacy @@ -28,43 +29,13 @@ apps: - opengl - network-bind - removable-media - - gnome-3-28-1804 - -plugs: - gnome-3-28-1804: - interface: content - target: gnome-platform - default-provider: gnome-3-28-1804:gnome-3-28-1804 - content: gnome-3-28-1804 - gtk-3-themes: - interface: content - target: $SNAP/data-dir/themes - default-provider: gtk-common-themes:gtk-3-themes - icon-themes: - interface: content - target: $SNAP/data-dir/icons - default-provider: gtk-common-themes:icon-themes - parts: jabref: - plugin: x_gradle - source: . - source-type: git + plugin: dump + source: build/distribution/JabRef-portable_linux.tar.gz + # override-pull: | + # snapcraftctl pull + # snapcraftctl set-version "$(cat app/JabRef.cfg | grep "app.version=" | cut -d'=' -f2)" stage-packages: - - openjdk-11-jre - - openjfx - x11-utils - gradle-options: [jlink, -xtest] - gradle-output-dir: 'build/image' - desktop-gnome-platform: - source: https://github.com/ubuntu/snapcraft-desktop-helpers.git - source-subdir: gtk - plugin: make - make-parameters: ["FLAVOR=gtk3"] - build-packages: - - build-essential - - libgtk-3-dev - override-build: | - snapcraftctl build - mkdir -pv $SNAPCRAFT_PART_INSTALL/gnome-platform diff --git a/src/main/resources/csl-locales b/src/main/resources/csl-locales index e89e6b08b5c..9785a6e3584 160000 --- a/src/main/resources/csl-locales +++ b/src/main/resources/csl-locales @@ -1 +1 @@ -Subproject commit e89e6b08b5c621a414fc7114f2129efac5f8c7d5 +Subproject commit 9785a6e3584e8c903df3d5a53f0e800dcabd282b diff --git a/src/main/resources/csl-styles b/src/main/resources/csl-styles index 36ac1f63004..6169061a140 160000 --- a/src/main/resources/csl-styles +++ b/src/main/resources/csl-styles @@ -1 +1 @@ -Subproject commit 36ac1f63004b1b85c8aed51f7111a8bed3fb7208 +Subproject commit 6169061a140068e897337de95f917008037fcd3b