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.

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

[WIP] Java11gtk3 #5322

Closed
wants to merge 39 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
8591e09
Try to fix log4j
tobiasdiez Sep 14, 2019
e4dfbbb
Try to add annotationProcessor statment
tobiasdiez Sep 15, 2019
ac712ef
Bump com.github.ben-manes.versions from 0.24.0 to 0.25.0
dependabot-preview[bot] Sep 16, 2019
d6c9cb3
Remove unnecessary stage-packages
LyzardKing Sep 11, 2019
3f62e2c
Remove duplicate java libraries
LyzardKing Sep 16, 2019
d7f05a4
Fix logger
tobiasdiez Sep 16, 2019
4f7ac75
Merge pull request #5316 from JabRef/dependabot/gradle/com.github.ben…
Siedlerchr Sep 16, 2019
3a57891
Pin snapshot versions
tobiasdiez Sep 16, 2019
9a60d74
Remove module exports for JabRef
tobiasdiez Sep 16, 2019
15c3d99
Merge pull request #5324 from JabRef/moduleExport
Siedlerchr Sep 16, 2019
0914c61
Merge pull request #5313 from JabRef/log4j
Siedlerchr Sep 16, 2019
1bec5ef
Use binding to update global state manager (#5325)
tobiasdiez Sep 16, 2019
a01ea20
Conversion of preferences/exportsorting, import, maintable and entrye…
calixtus Sep 17, 2019
5502659
Improve group coloring and item count
tobiasdiez Sep 17, 2019
23d792c
Fix group edit dialog
tobiasdiez Sep 17, 2019
459f2d3
Merge pull request #5328 from JabRef/fix5327
Siedlerchr Sep 18, 2019
1601770
Merge pull request #5329 from JabRef/fixgroupdialog
Siedlerchr Sep 18, 2019
db96f88
Fix problem with search and switching between libraries (#5326)
tobiasdiez Sep 18, 2019
2bd0995
Fix NPE when opening a non existing file from the recent files menu (…
Siedlerchr Sep 21, 2019
1ab09a8
fix encoding issues in xjc code generation
matthiasgeiger Sep 22, 2019
8986bd7
Bump fontbox from 2.0.16 to 2.0.17
dependabot-preview[bot] Sep 23, 2019
2b3a269
Bump src/main/resources/csl-styles from `0581021` to `7ac5e43`
dependabot-preview[bot] Sep 23, 2019
ca105b8
Merge pull request #5345 from JabRef/dependabot/gradle/org.apache.pdf…
dependabot-preview[bot] Sep 23, 2019
f5c6df1
Bump pdfbox from 2.0.16 to 2.0.17
dependabot-preview[bot] Sep 23, 2019
8a0ae28
Merge pull request #5346 from JabRef/dependabot/submodules/src/main/r…
dependabot-preview[bot] Sep 23, 2019
293e667
update automatic module name
Siedlerchr Sep 23, 2019
9cc7ce7
Merge pull request #5343 from JabRef/dependabot/gradle/org.apache.pdf…
dependabot-preview[bot] Sep 23, 2019
caafef1
Merge pull request #5339 from JabRef/fix-xjc-encoding
Siedlerchr Sep 24, 2019
a9bc912
Fix exception when closing JabRef (#5351)
tobiasdiez Sep 25, 2019
d1307a8
Bring back the context menu (#5352)
tobiasdiez Sep 26, 2019
6ebb7af
Fix group color when scrolling
tobiasdiez Sep 26, 2019
c0ab692
Fix default group color
tobiasdiez Sep 26, 2019
8644ef7
Merge pull request #5355 from JabRef/fixGroupColor
Siedlerchr Sep 26, 2019
1a6c92c
Merge pull request #5354 from JabRef/fixGroupScroll
Siedlerchr Sep 26, 2019
124fadb
Use Github Actions for deployment (#5312)
tobiasdiez Sep 26, 2019
4fb0cd9
Remove unnecessary stage-packages
LyzardKing Sep 11, 2019
2ae47f0
Remove duplicate java libraries
LyzardKing Sep 16, 2019
421ca40
Change bin name
LyzardKing Sep 27, 2019
af471a3
Merge branch 'java11gtk3' of github.com:LyzardKing/jabref into java11…
LyzardKing Sep 27, 2019
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
85 changes: 0 additions & 85 deletions .circleci/config.yml

This file was deleted.

87 changes: 87 additions & 0 deletions .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
name: Deployment

on: [push]

jobs:
deploy:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
include:
- os: ubuntu-latest
displayName: linux
jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-35_linux-x64_bin.tar.gz
jdk14Path: /jdk-14
archivePortable: tar -czf build/distribution/JabRef-portable_linux.tar.gz -C build/distribution JabRef && rm -R build/distribution/JabRef
- os: windows-latest
displayName: windows
jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-35_windows-x64_bin.zip
jdk14Path: /jdk-14
archivePortable: 7z a -r build/distribution/JabRef-portable_windows.zip build/distribution/JabRef/ && rm -R build/distribution/JabRef
- os: macOS-latest
displayName: macOS
jpackageDownload: https://download.java.net/java/early_access/jpackage/1/openjdk-14-jpackage+1-35_osx-x64_bin.tar.gz
jdk14Path: /jdk-14.jdk/Contents/Home
archivePortable: tar -czf build/distribution/JabRef-portable_macos.tar.gz -C build/distribution JabRef.app && rm -R build/distribution/JabRef.app

runs-on: ${{ matrix.os }}
name: Deploy on ${{ matrix.displayName }}

steps:
- name: Checkout source
uses: actions/checkout@v1
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 11.0.4
- name: Download jpackage
# We need to download jpackage from https://jdk.java.net/jpackage/
run: |
import tarfile
import zipfile
import sys
if sys.version_info[0] >= 3:
from urllib.request import urlretrieve
else:
from urllib import urlretrieve

url = "${{ matrix.jpackageDownload }}"
tmpfile, headers = urlretrieve(url)
if (url.endswith("tar.gz")):
tar = tarfile.open(tmpfile)
tar.extractall()
tar.close()
elif (url.endswith("zip")):
zip = zipfile.ZipFile(tmpfile)
zip.extractall()
zip.close()
shell: python
- name: Build runtime image
run: ./gradlew -Pdev=true jlinkZip
- name: Build installer
run: |
export BADASS_JLINK_JPACKAGE_HOME="${GITHUB_WORKSPACE}${{ matrix.jdk14Path }}"
./gradlew -Pdev=true jpackage
shell: bash
- name: Add installer as artifact
uses: actions/upload-artifact@master
with:
name: JabRef-${{ matrix.displayName }}
path: build/distribution
- name: Package application image
run: ${{ matrix.archivePortable }}
shell: bash
- name: Extract branch name
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:
local: build/distribution
remote: www/${{ steps.extract_branch.outputs.branch }}
host: builds.jabref.org
username: builds_jabref_org
privateKey: ${{ secrets.buildJabRefPrivateKey }}
port: 9922
17 changes: 14 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,20 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#

### Fixed

- Inherit fields from cross-referenced entries as specified by biblatex [#5045](https://github.com/JabRef/jabref/issues/5045)
- We fixed an issue where it was no longer possible to connect to LibreOffice [#5261](https://github.com/JabRef/jabref/issues/5261)

- Inherit fields from cross-referenced entries as specified by biblatex. [#5045](https://github.com/JabRef/jabref/issues/5045)
- We fixed an issue where it was no longer possible to connect to LibreOffice. [#5261](https://github.com/JabRef/jabref/issues/5261)
- The "All entries group" is no longer shown when no library is open.
- We fixed an exception which occurred when closing JabRef. [#5348](https://github.com/JabRef/jabref/issues/5348)
- We fixed an error where the groups containing an entry loose their highlight color when scrolling. [#5022](https://github.com/JabRef/jabref/issues/5022)
- After assigning an entry to a group, the item count is now properly colored to reflect the new membership of the entry. [#3112](https://github.com/JabRef/jabref/issues/3112)
- The group panel is now properly updated when switching between libraries (or when closing/opening one). [#3142](https://github.com/JabRef/jabref/issues/3142)
- We fixed an error where the number of matched entries shown in the group pane was not updated correctly. [#4441](https://github.com/JabRef/jabref/issues/4441)
- 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)
- 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)

### Removed

Expand Down
Loading