Skip to content

Commit

Permalink
fix: small fixes and put back version 0.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
vemonet committed Oct 15, 2024
1 parent 83344d7 commit 76a7bc8
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,12 @@ translate:
node resources/internationalize.js $(version)

bump:
sed -i "s/\"version\": \"[0-9]*\.[0-9]*\.[0-9]*\",/\"version\": \"$(version)\",/g" ./package.json
sed -i "s/\"version\": \"[0-9]*\.[0-9]*\.[0-9]*\"/\"version\": \"$(version)\"/g" ./src-tauri/tauri.conf.json
sed -i "s/version = \"[0-9]*\.[0-9]*\.[0-9]*\"/version = \"$(version)\"/g" ./src-tauri/Cargo.toml
rm -rf src-tauri/target/release/bundle
npx tauri-version $(version)

# sed -i "s/\"version\": \"[0-9]*\.[0-9]*\.[0-9]*\",/\"version\": \"$(version)\",/g" ./package.json
# sed -i "s/\"version\": \"[0-9]*\.[0-9]*\.[0-9]*\"/\"version\": \"$(version)\"/g" ./src-tauri/tauri.conf.json
# sed -i "s/version = \"[0-9]*\.[0-9]*\.[0-9]*\"/version = \"$(version)\"/g" ./src-tauri/Cargo.toml
# rm -rf src-tauri/target/release/bundle
# git add package.json src-tauri/tauri.conf.json src-tauri/Cargo.toml
# git commit -m "⏫ Bump to version $(version)"

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Or you can do it from the terminal, but you will need to adapt it if you already
gsettings get org.gnome.settings-daemon.plugins.media-keys custom-keybindings

# Create shortcut 0 triggered with Super+E
gsettings set org.gnome.settings-daemon.plugins.media-keys custom-keybindings "['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/]"
gsettings set org.gnome.settings-daemon.plugins.media-keys custom-keybindings "['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/']"
gsettings set org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/ name 'Emoji Mart'
gsettings set org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/ command 'flatpak run io.github.vemonet.EmojiMart'
gsettings set org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/ binding '<Super>e'
Expand Down Expand Up @@ -258,7 +258,7 @@ To publish a new release, follow this process:
1. Changed the version in: `package.json`, `src-tauri/Cargo.toml` and `src-tauri/tauri.conf.json`, you can use this script to do it automatically for a specific new version:

```bash
make bump version=0.1.2
make bump version=patch
```

2. Merge the `main` branch to the `release` branch, and push the `release` branch to GitHub:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "emoji-mart-app",
"version": "0.4.0",
"version": "0.3.0",
"license": "MIT",
"description": "Emoji picker app for desktop. Built with the Emoji Mart web component, and packaged as a tauri app.",
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "emoji-mart-app"
version = "0.4.0"
version = "0.3.0"
description = "Emoji picker for desktop. Built with the Emoji Mart web component, and packaged as a tauri app."
authors = ["Vincent Emonet"]
license = ""
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"productName": "EmojiMart",
"version": "0.4.0",
"version": "0.3.0",
"identifier": "io.github.vemonet.EmojiMart",
"build": {
"beforeDevCommand": "npm run dev",
Expand Down

0 comments on commit 76a7bc8

Please sign in to comment.