diff --git a/README.md b/README.md index f9ced4f..2f9520e 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,15 @@ create two separate projects in SonarCube panel. First project for host app, and second project for client viewer app. TODO: add how to get started with local SonarCube for Deskreen in details. +## Note on versioning: + +- All versions git tags should start with `v` ex. `v1.0.0` +- Before making a new release with `git push ` set version + to `` ! without `v` in the beginning! (ex. `1.0.0` -- not start with `v`) in these three files: + - `package.json` -- in `version` key ex. `1.0.0` + - `app/package.json` -- in `version` key ex. `1.0.0` + - `app/package-lock.json` -- in `version` key ex. `1.0.0` + ## Maintainer - [Pavlo (Paul) Buidenkov](https://www.linkedin.com/in/pavlobu) diff --git a/app/components/SettingsOverlay/SettingsOverlay.tsx b/app/components/SettingsOverlay/SettingsOverlay.tsx index 51f530c..37fdcb0 100644 --- a/app/components/SettingsOverlay/SettingsOverlay.tsx +++ b/app/components/SettingsOverlay/SettingsOverlay.tsx @@ -377,7 +377,7 @@ export default function SettingsOverlay(props: SettingsOverlayProps) { onClick={(e) => { e.preventDefault(); shell.openExternal( - 'https://github.com/pavlobu/deskreen/releases/' + 'https://github.com/pavlobu/deskreen/releases/latest' ); }} > diff --git a/app/main.dev.ts b/app/main.dev.ts index 5dddd00..db3b2ec 100644 --- a/app/main.dev.ts +++ b/app/main.dev.ts @@ -63,13 +63,15 @@ export default class DeskreenApp { const showNotification = () => { const notification = { title: 'Deskreen Update is Available!', - body: `Your current version is ${this.appVersion} Click to download new 1.0.1 updated version.`, + body: `Your current version is ${this.appVersion} Click to download new ${this.latestVersion} updated version.`, }; const notificationInstance = new Notification(notification); notificationInstance.show(); notificationInstance.on('click', (event) => { event.preventDefault(); // prevent the browser from focusing the Notification's tab - shell.openExternal('https://github.com/pavlobu/deskreen/releases/'); + shell.openExternal( + 'https://github.com/pavlobu/deskreen/releases/latest' + ); }); }; diff --git a/app/package-lock.json b/app/package-lock.json index ea72cc1..828a144 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,5 +1,5 @@ { "name": "deskreen", - "version": "1.0.0-alfa-beta", + "version": "1.0.0", "lockfileVersion": 1 } diff --git a/app/package.json b/app/package.json index eb8fa00..cde4334 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "deskreen", "productName": "deskreen", - "version": "1.0.0-alfa-beta", + "version": "1.0.0", "description": "Deskreen makes any device a second screen for your computer", "main": "./main.prod.js", "author": { diff --git a/app/utils/getNewVersionTag.ts b/app/utils/getNewVersionTag.ts index 1d5055e..fc8b79b 100644 --- a/app/utils/getNewVersionTag.ts +++ b/app/utils/getNewVersionTag.ts @@ -2,7 +2,7 @@ import axios from 'axios'; const githubApiRepoTagsUrl = - 'https://api.github.com/repos/pavlobu/circleCInodeapp/tags'; + 'https://api.github.com/repos/pavlobu/deskreen/tags'; export default async function getNewVersionTag() { let latestVersionTag = ''; @@ -18,6 +18,7 @@ export default async function getNewVersionTag() { }); latestVersionTag = foundTag ? foundTag.name : ''; + latestVersionTag = latestVersionTag.slice(1); return latestVersionTag; } diff --git a/package.json b/package.json index 24ea565..f6ee223 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "deskreen", "productName": "Deskreen", - "version": "1.0.0-alfa-beta", + "version": "1.0.0", "description": "Deskreen makes any device a second screen for your computer", "scripts": { "build": "yarn build-main && yarn build-renderer && yarn build-client",