Skip to content

Commit

Permalink
Merge pull request #525 from RADAR-base/staging-app
Browse files Browse the repository at this point in the history
Release 0.6.4-alpha
  • Loading branch information
mpgxvii authored Jul 2, 2019
2 parents fb833e4 + 5d9d03a commit 2476f2c
Show file tree
Hide file tree
Showing 9 changed files with 327 additions and 363 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ before_install:
-in secrets.tar.enc -out secrets.tar -d
- tar xvf secrets.tar
- gem install fastlane
- yarn global add cordova@^8.1.2
- yarn global add ionic@^4.12.0
- yarn global add cordova
- yarn global add ionic
before_script:
- mkdir www
- cp secret.ts src/assets/data/secret.ts
Expand All @@ -65,7 +65,6 @@ script:
- yarn run lint:css
- if [[ $TRAVIS_BRANCH != $TRAVIS_TAG ]]; then yarn build ; fi
- if [[ $TRAVIS_BRANCH == $TRAVIS_TAG ]]; then cordova prepare;
yarn add rxjs;
yarn install;
ionic cordova build --release android;
jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -storepass $storepass -keystore radar-armt-release-key.keystore $HOME/build/$PROJECT_NAME/platforms/android/app/build/outputs/apk/release/app-release-unsigned.apk alias_name;
Expand Down
8 changes: 4 additions & 4 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 android-versionCode="528" id="org.phidatalab.radar_armt" version="0.6.3-alpha"
<widget android-versionCode="530" id="org.phidatalab.radar_armt" version="0.6.4-alpha"
xmlns="http://www.w3.org/ns/widgets"
xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>RADAR Questionnaire</name>
Expand Down Expand Up @@ -74,7 +74,7 @@
<allow-navigation href="http://10.131.139.253:8101" />
<allow-navigation href="http://10.131.139.253:8100" />
<allow-navigation href="http://10.40.221.18:8101" />
<plugin name="cordova-android-support-gradle-release" spec="^3.0.0">
<plugin name="cordova-android-support-gradle-release" spec="^3.0.1">
<variable name="ANDROID_SUPPORT_VERSION" value="27.+" />
</plugin>
<plugin name="cordova-plugin-android-permissions" spec="^1.0.0" />
Expand All @@ -85,7 +85,7 @@
<plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
<plugin name="cordova-plugin-vibration" spec="^3.1.0" />
<plugin name="cordova-plugin-whitelist" spec="^1.3.3" />
<plugin name="cordova-sqlite-storage" spec="^3.2.0" />
<plugin name="cordova-sqlite-storage" spec="^3.2.1" />
<plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
<plugin name="cordova-plugin-local-notification" spec="^0.9.0-beta.3" />
<plugin name="cordova-plugin-app-version" spec="^0.1.9" />
Expand All @@ -95,7 +95,7 @@
<plugin name="cordova-plugin-file" spec="^6.0.1" />
<plugin name="cordova-plugin-insomnia" spec="^4.3.0" />
<plugin name="cordova-plugin-firebase-with-upstream-messaging" spec="^2.1.0" />
<plugin name="phonegap-plugin-barcodescanner" spec="^8.0.1">
<plugin name="phonegap-plugin-barcodescanner" spec="^8.1.0">
<variable name="ANDROID_SUPPORT_V4_VERSION" value="27.+" />
</plugin>
<plugin name="cordova-plugin-androidx" spec="^1.0.2" />
Expand Down
Loading

0 comments on commit 2476f2c

Please sign in to comment.