Skip to content

Commit

Permalink
Merge pull request #1373 from aeternity/develop
Browse files Browse the repository at this point in the history
Release 0.23.1
  • Loading branch information
davidyuk authored Mar 17, 2020
2 parents 7c318b8 + bd4957c commit 581f1a8
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 8 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ matrix:

cache:
directories:
- node_modules
- platforms
- plugins
- /home/travis/.cache/Cypress
Expand Down
4 changes: 2 additions & 2 deletions config.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="com.aeternity.base" version="0.23.0" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="com.aeternity.base" version="0.23.1" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Base æpp</name>
<author href="https://aeternity.com">
aeternity developers
Expand Down Expand Up @@ -62,7 +62,7 @@
<plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
<plugin name="cordova-plugin-headercolor" spec="^1.0.0" />
<plugin name="cordova-clipboard" spec="^1.3.0" />
<plugin name="ionic-plugin-deeplinks" spec="^1.0.20">
<plugin name="ionic-plugin-deeplinks" spec="github:aeternity/ionic-plugin-deeplinks">
<variable name="URL_SCHEME" value="aepp-base" />
<variable name="DEEPLINK_HOST" value="base.aepps.com" />
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aepp-base",
"version": "0.23.0",
"version": "0.23.1",
"author": "Sascha Hanse <[email protected]>",
"private": true,
"scripts": {
Expand Down
File renamed without changes.
9 changes: 7 additions & 2 deletions scripts/current-branch.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
const { execSync } = require('child_process');

const branch = process.env.TRAVIS_BRANCH
|| execSync('git rev-parse --abbrev-ref HEAD').toString().trim();
const { TRAVIS, TRAVIS_BRANCH, TRAVIS_TAG } = process.env;

const travisBranch = TRAVIS_BRANCH === TRAVIS_TAG ? 'master' : TRAVIS_BRANCH;

const branch = TRAVIS
? travisBranch
: execSync('git rev-parse --abbrev-ref HEAD').toString().trim();

module.exports = branch;
3 changes: 2 additions & 1 deletion src/popup.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ import store from './store';
import languages, { i18n } from './store/plugins/ui/languages';
import initSdk from './store/plugins/initSdk';
import names from './store/plugins/ui/names';
import appsMetadata from './store/plugins/ui/appsMetadata';
import ConfirmAccountAccess from './components/ConfirmAccountAccess.vue';

Vue.use(Vuex);

[languages, initSdk, names].forEach(plugin => plugin(store));
[languages, initSdk, names, appsMetadata].forEach(plugin => plugin(store));

const unloadHandler = () => {
window.reject(new Error('Rejected by user'));
Expand Down

0 comments on commit 581f1a8

Please sign in to comment.