Skip to content

Commit

Permalink
Merge pull request #800 from aeternity/release/v0.8.3
Browse files Browse the repository at this point in the history
Release 0.8.3
  • Loading branch information
CedrikNikita authored May 21, 2019
2 parents 3568760 + 8617569 commit c06009d
Show file tree
Hide file tree
Showing 24 changed files with 324 additions and 260 deletions.
40 changes: 28 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,34 @@
language: node_js
os:
- linux
- osx
osx_image: xcode10.2
node_js:
- '10'
matrix:
include:
- language: node_js
node_js: '10'
script: scripts/test.sh

- language: android
android:
components:
- build-tools-28.0.3
- android-28
before_install:
- yes | sdkmanager "platforms;android-28"
- nvm install 10
script: scripts/build-cordova.sh

- language: objective-c
os: osx
osx_image: xcode10.2
before_install: nvm install 10
script: scripts/build-cordova.sh

cache:
directories:
- node_modules
- platforms
- plugins
- /home/travis/.cache/Cypress
install:
- travis_wait 30 scripts/install.sh
script: scripts/script.sh
before_deploy: scripts/before-deploy.sh

install: travis_wait 30 scripts/install.sh

deploy:
- provider: script
skip_cleanup: true
Expand All @@ -23,7 +37,9 @@ deploy:
all_branches: true
- provider: releases
api_key: $GITHUB_TOKEN
file: aeternity.app.tar.gz
file:
- aeternity.apk
- aeternity.app.tar.gz
skip_cleanup: true
on:
condition: $TRAVIS_OS_NAME = osx
Expand Down
29 changes: 0 additions & 29 deletions Dockerfile.ci

This file was deleted.

20 changes: 0 additions & 20 deletions Jenkinsfile

This file was deleted.

12 changes: 8 additions & 4 deletions config.xml
Original file line number Diff line number Diff line change
@@ -1,28 +1,32 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="com.aeternity.base" version="0.8.2" 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.8.3" 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
</author>
<content src="index.html" />
<access origin="*" />
<allow-intent href="http://*/*" />
<allow-intent href="https://*/*" />
<allow-intent href="tel:*" />
<allow-intent href="sms:*" />
<allow-intent href="mailto:*" />
<allow-intent href="geo:*" />
<allow-navigation href="*" />
<platform name="android">
<access origin="*.aepps.com" />
<access origin="aeternity.com" />
<access origin="api.backendless.com" />
<access origin="cors-anywhere.herokuapp.com" />
<allow-intent href="market:*" />
<preference name="SplashMaintainAspectRatio" value="true" />
<edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">
<application android:usesCleartextTraffic="true" />
<application android:usesCleartextTraffic="true" />
</edit-config>
</platform>
<platform name="ios">
<access origin="*" />
<allow-intent href="itms:*" />
<allow-intent href="itms-apps:*" />
<allow-navigation href="*" />
<preference name="UseSwiftLanguageVersion" value="5" />
<preference name="DisallowOverscroll" value="true" />
</platform>
Expand Down
Loading

0 comments on commit c06009d

Please sign in to comment.