Skip to content

Commit

Permalink
Merge branch 'v14_ums' into main_v14
Browse files Browse the repository at this point in the history
* v14_ums: (27 commits)
  set NSIS as DPI-aware application so the text is never blurry on the installer. added more svg icon
  check for NPE when using java.net.URI.create(String str)
  Bump react-router-dom from 6.21.2 to 6.21.3 in /react-client (UniversalMediaServer#4408)
  added logo svg
  stop using the deprecated com.jgoodies.forms.builder.PanelBuilder Class. stop using the deprecated com.jgoodies.forms.factories.Borders Class. stop using the deprecated org.apache.commons.io.input.BOMInputStream Constructor. stop using the deprecated java.net.URL Constructor. stop using the deprecated java.util.Locale Constructor. stop using the obsolete java.lang.Runtime.exec(String command) Method. stop using the deprecated java.lang.Object.finalize() Method. stop using the obsolete javax.swing.text.JTextComponent.modelToView(int pos) Method. stop using the unsupported com.sun.nio.file.ExtendedWatchEventModifier ensure InterruptedException is propagated. replace String.equals("") -> String.isEmpty()
  Updates to INSTALL.txt (fixes UniversalMediaServer#4409) (thanks, easleydp!)
  Remove attempt at automate Dependabot rebasing
  lint
  getTrayIcon now has the final expected pixels. (this may also be useful for mac retina) added icons for all screen resolution factors (100 to 350%). fix deprecated exec string param.
  Bump @types/react from 18.2.47 to 18.2.48 in /react-client (UniversalMediaServer#4392)
  Test comment and label on conflicted PR
  Bump actions/cache from 3 to 4 (UniversalMediaServer#4400)
  Define groups in Dependabot and remove Renovate
  Bump org.mockito:mockito-junit-jupiter from 5.8.0 to 5.9.0 (UniversalMediaServer#4388)
  Bump @playwright/test from 1.40.1 to 1.41.0 in /react-client (UniversalMediaServer#4397)
  Bump @typescript-eslint/eslint-plugin from 6.18.1 to 6.19.0 in /react-client (UniversalMediaServer#4391)
  Bump react-router-dom from 6.21.1 to 6.21.2 in /react-client (UniversalMediaServer#4380)
  Bump @typescript-eslint/parser from 6.17.0 to 6.18.1 in /react-client (UniversalMediaServer#4365)
  ConcurrentHashMap instead of HashMap as multiple thread can access it.
  move SystemTray away from newgui to its own class. move Splash away from newgui to its own class. AutoUpdater : deprecated Observable -> EventListener. AutoUpdater is responsible to propagate if an update is available instead of newgui. tray icon for update is now auto created. refactored squared icon to icon-square-* refactored black and with icon to icon-bw-* put back old splash screen. add ability to translate the new status texts
  ...
  • Loading branch information
sf666 committed Jan 22, 2024
2 parents 6cd6b04 + 238fdb8 commit fc15213
Show file tree
Hide file tree
Showing 127 changed files with 1,590 additions and 1,167 deletions.
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,16 @@ updates:
directory: "/react-client"
schedule:
interval: "daily"
groups:
eslint:
patterns:
- "*eslint*|eslint|eslint*"
mantine:
patterns:
- "@mantine*"
react:
patterns:
- "react|react-dom"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
cache: 'maven'
- name: Cache Node dependencies
id: cache-node-dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
react-client/.yarn
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
cache: 'maven'
- name: Cache Node dependencies
id: cache-node-dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
react-client/.yarn
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
cache: 'maven'
- name: Cache Node dependencies
id: cache-node-dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
react-client/.yarn
Expand Down Expand Up @@ -177,7 +177,7 @@ jobs:
cache: 'maven'
- name: Cache Node dependencies
id: cache-node-dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
react-client/.yarn
Expand Down Expand Up @@ -215,7 +215,7 @@ jobs:
cache: 'maven'
- name: Cache Node dependencies
id: cache-node-dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
react-client/.yarn
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@

### Dependencies
- Bump `axios` from 1.6.4 to 1.6.5 ([#4349](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4349))
- Bump `org.apache.maven.plugins:maven-surefire-plugin` from 3.2.3 to 3.2.5 ([#4371](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4371))
- Bump `@typescript-eslint/eslint-plugin` from 6.17.0 to 6.19.0 ([#4376](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4376), [#4391](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4391))
- Bump `@typescript-eslint/parser` from 6.17.0 to 6.18.1 ([#4365](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4365))
- Bump `react-router-dom` from 6.21.1 to 6.21.3 ([#4380](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4380), [#4408](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4408))
- Bump `@playwright/test` from 1.40.1 to 1.41.0 ([#4397](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4397))
- Bump `org.mockito:mockito-junit-jupiter` from 5.8.0 to 5.9.0 ([#4388](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4388))
- Bump `actions/cache` from 3 to 4 ([#4400](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4400))
- Bump `@types/react` from 18.2.47 to 18.2.48 ([#4392](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4392))

## [14.0.0-b1](https://github.com/UniversalMediaServer/UniversalMediaServer/compare/13.8.1...v14) (2023-12-08)

Expand Down
10 changes: 5 additions & 5 deletions INSTALL.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
Installers for Windows and Mac OS X and tarballs for Linux can be found at:
Installers for Windows and macOS and tarballs for Linux can be found at:

https://www.universalmediaserver.com

To install UMS from the tarball on Linux, open a terminal and enter the
following commands (set VERSION to the version you're installing):
Note: These instructions have been tested on Ubuntu 16.04, but something similar
Note: These instructions have been tested on Ubuntu 22.04, but something similar
should work on most Unix distributions)

1. Install the dependencies (this only needs to be done once):

All releases of UMS come with Java Runtime Environment bundled, except for
the ARM architecture releases. You will need to ensure you have JRE 8 installed.
the ARM architecture releases. You will need to ensure you have JRE 17 installed.

Next, add some other pre-reqs:

sudo apt-get install mediainfo dcraw vlc-nox mplayer mencoder
sudo apt-get install mediainfo dcraw vlc-bin mplayer mencoder

you can also optionally install dcraw and VLC: `sudo apt-get install dcraw vlc`
you can also optionally install dcraw: `sudo apt-get install dcraw`

2. Download the tarball e.g.:

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
-->
<jackson.version>2.16.1</jackson.version>

<surefire-version>3.2.3</surefire-version>
<surefire-version>3.2.5</surefire-version>

<!--
net.java.dev.jna:jna-platform is shared with
Expand Down
24 changes: 12 additions & 12 deletions react-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
"private": true,
"proxy": "http://localhost:9001",
"dependencies": {
"@mantine/core": "7.4.0",
"@mantine/dropzone": "7.4.0",
"@mantine/form": "7.4.0",
"@mantine/hooks": "7.4.0",
"@mantine/modals": "7.4.0",
"@mantine/notifications": "7.4.0",
"@mantine/core": "7.4.2",
"@mantine/dropzone": "7.4.2",
"@mantine/form": "7.4.2",
"@mantine/hooks": "7.4.2",
"@mantine/modals": "7.4.2",
"@mantine/notifications": "7.4.2",
"@microsoft/fetch-event-source": "2.0.1",
"axios": "1.6.5",
"jwt-decode": "4.0.0",
Expand All @@ -18,7 +18,7 @@
"react-country-flag": "3.1.0",
"react-dom": "18.2.0",
"react-movable": "3.0.4",
"react-router-dom": "6.21.1",
"react-router-dom": "6.21.3",
"tabler-icons-react": "1.56.0",
"typescript": "5.3.3",
"video.js": "8.9.0",
Expand Down Expand Up @@ -55,17 +55,17 @@
},
"packageManager": "yarn@4.0.2",
"devDependencies": {
"@playwright/test": "1.40.1",
"@playwright/test": "^1.41.0",
"@testing-library/jest-dom": "6.2.0",
"@testing-library/react": "14.1.2",
"@testing-library/user-event": "14.5.2",
"@types/jest": "29.5.11",
"@types/lodash": "4.14.202",
"@types/node": "18.19.5",
"@types/react": "18.2.47",
"@types/node": "18.19.8",
"@types/react": "18.2.48",
"@types/react-dom": "18.2.18",
"@typescript-eslint/eslint-plugin": "6.18.0",
"@typescript-eslint/parser": "6.18.0",
"@typescript-eslint/eslint-plugin": "6.19.0",
"@typescript-eslint/parser": "6.19.0",
"eslint": "8.56.0",
"eslint-plugin-react": "7.33.2",
"react-scripts": "5.0.1",
Expand Down
Binary file added react-client/public/icon-256.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added react-client/public/icon-32.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion react-client/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="icon" type="image/png" href="%PUBLIC_URL%/icon-256.png" sizes="256x256" />
<link rel="icon" type="image/png" href="%PUBLIC_URL%/icon-32.png" sizes="32x32" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" sizes="16x16" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
Expand Down
2 changes: 1 addition & 1 deletion react-client/public/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"sizes": "16x16",
"type": "image/x-icon"
}
],
Expand Down

0 comments on commit fc15213

Please sign in to comment.