Skip to content

Commit

Permalink
v0.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
blarfoon committed Sep 5, 2018
1 parent 87fda30 commit 3b4316f
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 18 deletions.
17 changes: 8 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,16 @@ matrix:
- sudo ls -l
# - node $TRAVIS_BUILD_DIR/scripts/preDeploy.js
deploy:
provider: s3
provider: releases
skip_cleanup: true
access_key_id: $AWS_ACCESS_KEY_ID
secret_access_key: $AWS_SECRET_ACCESS_KEY
bucket: "dl.gorilladevs.com"
region: $AWS_DEFAULT_REGION
acl: public_read
local_dir: $TRAVIS_BUILD_DIR/release
upload-dir: releases
prerelease: true
api_key:
secure: hF5RKP28CK3zGjqK++zNxMOjXNvGhq51kcbwV2hiMiBs8JSRVzLWgbemQ0qExVzvn5OxH+3GDlZLCeAfeZBjuC8cRqccWQyQ7OAT27PqW1ZvPCSsG6Xz53z6AC06A3j3DkcougqVSVbRBr6JLDZBlNxeVRle+KUM1f0CdmQJtBH71lYYiafmV/xu1rBG0zJJL60nhln84jiorKSekhVnLzyWH+W2H+a3Shl0/TcGvQAJ1oTCypYjmp7+/4vvRTX2wt016UVeW9UYPowBoJWvia3/5ptMJthoYdibQc0NrCvlx1E4L6HlNnrCSZwnxmP9d0mt5kekpmOu+QijS0OrwGSMADzwxfx34cwcLMoX/4Q/E4X4C6fgTSe8s3NODtfKtiiovgX6tNiTu+eLkV/UuRA3qxQGM9vlbbGv37CNY/VLSNbRsEQQsofTzKXjUZ09WcBrHrML2ZZ1j1TkPlkZBf8ZwyqF2Y4Zou+bRDuER1oAHzsptjap2GIa2F8mZ/im6p6DhlU0MvGo4LSbuJwdj5Gc0G/Yq296OUkvH7ue6LgzTceILygt7q2pwz2TJuEK8Sgs+/3wQ2wmjT3m3h4KMt0T1l/DPyZQbQDTUX/7jwI1ObvEbRLH5C+x5B163rN75MvWCDwPuBkErvRQTLE96h+GuGQZvxz34R84aB4zK0Y=
file:
- "$TRAVIS_BUILD_DIR/release/GDLauncher-win.zip"
- "$TRAVIS_BUILD_DIR/release/GDLauncher-linux.zip"
on:
branch: master
tags: true
- os: osx
osx_image: xcode9.4
language: node_js
Expand Down
7 changes: 5 additions & 2 deletions app/actions/autoUpdater.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,11 @@ export function checkForUpdates() {
const res = await axios.get(UPDATE_URL);
const actualVersion = packageJson.version;
// versionsCompare returns positive if v1 > v2, negative if v1 < v2, 0 if they're equal
if (versionsCompare(res.data.latestVersion, actualVersion) === 1) {
dispatch({ type: UPDATE_AVAILABLE });
if (versionsCompare(res.data.version, actualVersion) === 1) {
dispatch({
type: UPDATE_AVAILABLE,
payload: res.data.version
});
}
} catch (err) {
console.error(err.message);
Expand Down
9 changes: 7 additions & 2 deletions app/components/Common/SideBar/SideBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@ class SideBar extends Component<Props> {
return (
<aside className={styles.sidenav}>
{this.props.updateAvailable && <div className={styles.updateAvailable}>
<Button loading={this.props.updating} onClick={this.props.update} type="primary" size="small" style={{ marginLeft: 5 }}>Update Available</Button>
<Button loading={this.props.updating} onClick={this.props.update} type="primary" size="small" style={{ marginLeft: 5 }}>
<a href={`https://github.com/gorilla-devs/GDLauncher/releases/tag/v${this.props.latestVersion}`} target="_blank" rel="noopener noreferrer">
Update Available ({this.props.latestVersion})
</a>
</Button>
</div>}
<div className={styles.header}>
<span>
Expand All @@ -71,7 +75,7 @@ class SideBar extends Component<Props> {
<div className={styles.socialsContainer}>
{ /* eslint-disable */}
<a href="https://twitter.com/gorilladevs" target="_blank" rel="noopener noreferrer" className={styles.socialBtn}>
<i className="fab fa-twitter"/>
<i className="fab fa-twitter" />
</a>
<a href="https://facebook.com/gorilladevs" target="_blank" rel="noopener noreferrer" className={styles.socialBtn}>
<i className="fab fa-facebook"
Expand Down Expand Up @@ -102,6 +106,7 @@ function mapStateToProps(state) {
downloadQueue: state.downloadManager.downloadQueue,
updateAvailable: state.autoUpdater.updateAvailable,
updating: state.autoUpdater.checkingForUpdates,
latestVersion: state.autoUpdater.latestVersion,
};
}

Expand Down
5 changes: 5 additions & 0 deletions app/components/Common/SideBar/SideBar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
line-height: 40px;
width: 100%;
text-align: center;
a {
text-decoration: none;
display: block;
}
}
.header {
display: flex;
Expand Down Expand Up @@ -89,6 +93,7 @@
}
.version {
color: #7f8c8d;
padding-right: 9px;
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ export const LINUX = 'linux';
export const DARWIN = 'darwin';
export const NEWS_URL = 'https://minecraft.net/en-us/api/tiles/channel/not_set,Community%20content/region/None/category/Culture,Insider,News/page/1';
export const JAVA_URL = 'https://java.com/download';
export const UPDATE_URL = 'https://dl.gorilladevs.com/releases/latest.json';
export const UPDATE_URL = 'https://raw.githubusercontent.com/gorilla-devs/GDLauncher/master/package.json';
export const UPDATE_URL_CHECKSUMS = 'https://dl.gorilladevs.com/releases/latestChecksums.json';
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "gdlauncher",
"productName": "GDLauncher",
"version": "0.6.0",
"version": "0.6.1",
"description": "GDLauncher is simple, yet powerful Minecraft custom launcher with a strong focus on the user experience",
"main": "./main.prod.js",
"author": {
Expand Down
6 changes: 4 additions & 2 deletions app/reducers/autoUpdater.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import {

const initialState = {
checkingForUpdates: false,
updateAvailable: false
updateAvailable: false,
latestVersion: null
};

export default function instancesManager(state = initialState, action) {
Expand All @@ -24,7 +25,8 @@ export default function instancesManager(state = initialState, action) {
case `${UPDATE_AVAILABLE}`:
return {
...state,
updateAvailable: true
updateAvailable: true,
latestVersion: action.payload
};
default:
return state;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "gdlauncher",
"productName": "GDLauncher",
"version": "0.6.0",
"version": "0.6.1",
"description": "GDLauncher is simple, yet powerful Minecraft custom launcher with a strong focus on the user experience",
"scripts": {
"build": "concurrently \"npm run build-main\" \"npm run build-renderer\"",
Expand Down

0 comments on commit 3b4316f

Please sign in to comment.