Skip to content

Commit

Permalink
Upgrade all other dependencies (other than e-mission plugins)
Browse files Browse the repository at this point in the history 
So that we can stuck mucking around with our plugins properly
  • Loading branch information
@shankari
shankari committed Jul 15, 2020
1 parent d0d576d commit 9c705ab
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 40 deletions.
25 changes: 12 additions & 13 deletions config.cordovabuild.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,18 +111,18 @@
<variable name="FCM_VERSION" value="11.0.1" />
</plugin>
<plugin name="ionic-plugin-keyboard" spec="~2.2.1" />
<plugin name="cordova-plugin-app-version" spec="~0.1.9" />
<plugin name="cordova-plugin-file" spec="~6.0.2" />
<plugin name="cordova-plugin-device" spec="~2.0.1" />
<plugin name="cordova-plugin-app-version" spec="0.1.9" />
<plugin name="cordova-plugin-file" spec="6.0.2" />
<plugin name="cordova-plugin-device" spec="2.0.1" />
<plugin name="cordova-plugin-whitelist" spec="~1.3.3" />
<plugin name="cordova-plugin-customurlscheme" spec="~5.0.1">
<plugin name="cordova-plugin-customurlscheme" spec="5.0.1">
<variable name="URL_SCHEME" value="emission" />
</plugin>
<plugin name="cordova-plugin-email-composer" spec="^0.8.15" />
<plugin name="cordova-plugin-x-socialsharing" spec="^5.6.5" />
<plugin name="cordova-plugin-inappbrowser" spec="3.2.0" />
<plugin name="cordova-plugin-local-notification" spec="^0.9.0-beta.2" />
<plugin name="cordova-plugin-ionic-webview" spec="^4.1.3">
<plugin name="cordova-plugin-email-composer" spec="0.9.2" />
<plugin name="cordova-plugin-x-socialsharing" spec="6.0.0" />
<plugin name="cordova-plugin-inappbrowser" spec="4.0.0" />
<plugin name="cordova-plugin-local-notification" spec="0.9.0-beta.3" />
<plugin name="cordova-plugin-ionic-webview" spec="5.0.0">
<variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" />
</plugin>
<plugin name="cordova-plugin-ionic" spec="5.4.7">
Expand All @@ -132,8 +132,7 @@
<variable name="UPDATE_API" value="https://api.ionicjs.com" />
<variable name="MAX_STORE" value="2" />
</plugin>
<plugin name="cordova-plugin-advanced-http" spec="^2.4.1">
<variable name="OKHTTP_VERSION" value="3.10.0" />
<plugin name="cordova-plugin-advanced-http" spec="3.0.0">
</plugin>
<preference name="SplashShowOnlyFirstTime" value="false" />
<plugin name="edu.berkeley.eecs.emission.cordova.auth" spec="https://github.com/e-mission/cordova-jwt-auth.git#v1.6.2-alpha1" />
Expand All @@ -146,6 +145,6 @@
<plugin name="edu.berkeley.eecs.emission.cordova.transitionnotify" spec="https://github.com/e-mission/e-mission-transition-notify.git#v1.2.5" />
<plugin name="edu.berkeley.eecs.emission.cordova.unifiedlogger" spec="https://github.com/e-mission/cordova-unified-logger.git#v1.3.2" />
<plugin name="edu.berkeley.eecs.emission.cordova.usercache" spec="https://github.com/e-mission/cordova-usercache.git#v1.1.2" />
<engine name="ios" spec="^5.1.1" />
<engine name="android" spec="^8.1.0" />
<engine name="ios" spec="6.1.0" />
<engine name="android" spec="9.0.0" />
</widget>
56 changes: 29 additions & 27 deletions package.cordovabuild.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@
"name": "edu.berkeley.eecs.emission",
"version": "2.8.1",
"displayName": "emission",
"scripts": {
"setup-serve": "./bin/download_settings_controls.js",
"serve": "phonegap --verbose serve"
"license": "BSD-3-Clause",
"repository": {
"type": "git",
"url": "git+https://github.com/e-mission/cordova-connection-settings.git"
},
"devDependencies": {
"phonegap": "7.1.1",
"cordova": "8.0.0",
"ionic": "5.4.16",
"bower": "1.8.8",
"xml2js": "0.4.23"
"cordova": "9.0.0",
"@ionic/cli": "6.10.1",
"bower": "1.8.8"
},
"cordova": {
"platforms": [
Expand All @@ -29,8 +28,13 @@
"cordova-plugin-customurlscheme": {
"URL_SCHEME": "emission"
},
"cordova-plugin-email-composer": {},
"cordova-plugin-x-socialsharing": {},
"cordova-plugin-email-composer": {
"ANDROID_SUPPORT_V4_VERSION": "27.+"
},
"cordova-plugin-x-socialsharing": {
"PHOTO_LIBRARY_ADD_USAGE_DESCRIPTION": "This app requires photo library access to function properly.",
"PHOTO_LIBRARY_USAGE_DESCRIPTION": "This app requires photo library access to function properly."
},
"cordova-plugin-inappbrowser": {},
"cordova-plugin-local-notification": {},
"cordova-plugin-ionic": {
Expand All @@ -40,9 +44,7 @@
"UPDATE_API": "https://api.ionicjs.com",
"MAX_STORE": "2"
},
"cordova-plugin-advanced-http": {
"OKHTTP_VERSION": "3.10.0"
},
"cordova-plugin-advanced-http": {},
"cordova-plugin-ionic-webview": {
"ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
},
Expand All @@ -60,20 +62,20 @@
}
},
"dependencies": {
"cordova-android": "^8.1.0",
"cordova-ios": "^5.1.1",
"cordova-plugin-advanced-http": "^2.4.1",
"cordova-plugin-app-version": "~0.1.9",
"cordova-plugin-customurlscheme": "~4.3.0",
"cordova-plugin-device": "~2.0.1",
"cordova-plugin-email-composer": "^0.8.15",
"cordova-plugin-file": "~6.0.2",
"cordova-plugin-inappbrowser": "^3.2.0",
"cordova-plugin-ionic-webview": "^4.1.3",
"cordova-android": "9.0.0",
"cordova-ios": "6.1.0",
"cordova-plugin-advanced-http": "3.0.0",
"cordova-plugin-app-version": "0.1.9",
"cordova-plugin-customurlscheme": "5.0.1",
"cordova-plugin-device": "2.0.1",
"cordova-plugin-email-composer": "0.9.2",
"cordova-plugin-file": "6.0.2",
"cordova-plugin-inappbrowser": "4.0.0",
"cordova-plugin-ionic-webview": "5.0.0",
"cordova-plugin-ionic": "5.4.7",
"cordova-plugin-whitelist": "~1.3.3",
"cordova-plugin-x-socialsharing": "~5.6.5",
"cordova-plugin-local-notification": "^0.9.0-beta.2",
"cordova-plugin-x-socialsharing": "6.0.0",
"cordova-plugin-local-notification": "0.9.0-beta.3",
"e-mission-data-collection": "git+https://github.com/e-mission/e-mission-data-collection.git#v1.4.3",
"em-cordova-connection-settings": "git+https://github.com/e-mission/cordova-connection-settings.git#v1.2.1",
"em-cordova-jwt-auth": "git+https://github.com/e-mission/cordova-jwt-auth.git#v1.6.2-alpha1",
Expand All @@ -82,9 +84,9 @@
"em-cordova-transition-notify": "git+https://github.com/e-mission/e-mission-transition-notify.git#v1.2.5",
"em-cordova-unified-logger": "git+https://github.com/e-mission/cordova-unified-logger.git#v1.3.2",
"em-cordova-usercache": "git+https://github.com/e-mission/cordova-usercache.git#v1.1.2",
"fs-extra": "^5.0.0",
"fs-extra": "^9.0.1",
"ionic-plugin-keyboard": "~2.2.1",
"klaw-sync": "^3.0.2",
"klaw-sync": "^6.0.0",
"phonegap-plugin-push": "=2.3.0"
}
}

0 comments on commit 9c705ab

Please sign in to comment.