Skip to content

Commit

Permalink
Merge branch 'develop' into release
Browse files Browse the repository at this point in the history
Bump ferdium version to 6.7.7
  • Loading branch information
vraravam committed Sep 22, 2024
2 parents 5bed770 + dbe7fa8 commit a98731a
Show file tree
Hide file tree
Showing 7 changed files with 221 additions and 245 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.15.1
20.17.0
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ Currently, these are the combinations of system dependencies that work for MacOS
# Note: 'jq' is not a required system dependency; its only here to show the combined output of versions needed
$ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json
{
"node": "20.15.1",
"pnpm": "9.5.0"
"node": "20.17.0",
"pnpm": "9.9.0"
}
```

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Note: Before running this file, you should have already cloned the git repo + submodules on the host machine. This is used when actively developing on your local machine, but you want to build for a different architecture

FROM docker.io/library/node:20.15.1-buster AS builder
FROM docker.io/library/node:20.17.0-buster AS builder

ENV PATH="/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/usr/local/lib:/usr/include:/usr/share"

Expand Down
36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"productName": "Ferdium",
"desktopName": "ferdium.desktop",
"appId": "org.ferdium.ferdium-app",
"version": "6.7.6",
"version": "6.7.7",
"description": "Messaging app for WhatsApp, Slack, Telegram, Hangouts and many many more.",
"author": "Ferdium Contributors <[email protected]> (https://ferdium.org/)",
"license": "Apache-2.0",
Expand All @@ -13,15 +13,15 @@
"repository": "https://github.com/ferdium/ferdium-app.git",
"private": true,
"engines": {
"node": "20.15.1",
"pnpm": "9.5.0"
"node": "20.17.0",
"pnpm": "9.9.0"
},
"engine-strict": true,
"volta": {
"node": "20.15.1",
"pnpm": "9.5.0"
"node": "20.17.0",
"pnpm": "9.9.0"
},
"packageManager": "pnpm@9.5.0",
"packageManager": "pnpm@9.9.0",
"scripts": {
"prepare": "is-ci || husky",
"start": "electron ./build",
Expand Down Expand Up @@ -65,8 +65,8 @@
"@emotion/styled": "11.11.5",
"@mdi/js": "7.4.47",
"@mdi/react": "1.6.1",
"@mui/icons-material": "5.16.1",
"@mui/material": "5.16.1",
"@mui/icons-material": "5.16.7",
"@mui/material": "5.16.7",
"@octokit/core": "5.1.0",
"@sentry/electron": "4.14.0",
"@superwf/mobx-react-router": "7.4.0",
Expand All @@ -77,28 +77,28 @@
"csstype": "3.1.3",
"darkreader": "4.9.87",
"dbus-next": "0.10.2",
"debug": "4.3.5",
"debug": "4.3.6",
"electron-dl": "3.5.2",
"electron-find": "1.0.7",
"electron-react-titlebar": "1.2.1",
"electron-updater": "6.2.1",
"electron-window-state": "5.0.3",
"fast-folder-size": "2.2.0",
"fs-extra": "11.2.0",
"google-translate-api-x": "10.6.8",
"google-translate-api-x": "10.7.0",
"history": "5.3.0",
"immutable": "4.3.6",
"immutable": "4.3.7",
"jsonwebtoken": "9.0.2",
"jss": "10.10.0",
"languagedetect": "2.0.0",
"lodash": "4.17.21",
"macos-version": "5.2.1",
"markdown-to-jsx": "7.4.7",
"minimist": "1.2.8",
"mobx": "6.13.0",
"mobx": "6.13.1",
"mobx-localstorage": "1.2.0",
"mobx-react": "7.6.0",
"mobx-react-form": "6.9.4",
"mobx-react-form": "6.10.1",
"moment": "2.30.1",
"ms": "2.1.3",
"normalize-url": "6.1.0",
Expand All @@ -118,12 +118,12 @@
"react-modal": "3.16.1",
"react-router-dom": "6.24.1",
"react-sortable-hoc": "2.0.0",
"react-tooltip": "5.27.1",
"react-tooltip": "5.28.0",
"react-topbar-progress-indicator": "4.1.1",
"react-transition-group": "4.4.5",
"route-parser": "0.0.5",
"sanitize-filename": "1.6.3",
"semver": "7.6.2",
"semver": "7.6.3",
"sqlite3": "5.1.6",
"tar": "6.2.1",
"tslib": "2.6.3",
Expand All @@ -143,7 +143,7 @@
"@types/color": "3.0.6",
"@types/fs-extra": "11.0.4",
"@types/jest": "29.5.12",
"@types/lodash": "4.17.6",
"@types/lodash": "4.17.7",
"@types/minimist": "1.2.5",
"@types/ms": "0.7.34",
"@types/node": "20.14.10",
Expand All @@ -163,7 +163,7 @@
"chalk": "5.3.0",
"concurrently": "8.2.2",
"cross-env": "7.0.3",
"electron": "31.3.1",
"electron": "32.1.2",
"electron-builder": "24.13.3",
"esbuild": "0.16.17",
"esbuild-plugin-copy": "2.1.1",
Expand All @@ -182,7 +182,7 @@
"eslint-plugin-sonar": "0.13.2",
"eslint-plugin-unicorn": "52.0.0",
"gulp-livereload": "4.0.2",
"husky": "9.0.11",
"husky": "9.1.4",
"is-ci": "3.0.1",
"jest": "29.7.0",
"prettier": "3.3.3",
Expand Down
Loading

0 comments on commit a98731a

Please sign in to comment.