Skip to content

Commit

Permalink
Upgrade to the most recent version of google play services
Browse files Browse the repository at this point in the history
+ enable androidX (e-mission/e-mission-docs#554 (comment))
+ remaining instances of `android.support
    e-mission/e-mission-docs#554 (comment)
+ add the androidx adapter plugin to fix them

Everything compiles now
  • Loading branch information
shankari committed Jul 17, 2020
1 parent f9f78ee commit 0ae2109
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions config.cordovabuild.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
<hook src="hooks/before_build/android/android_copy_locales.js" type="before_build" />
<preference name="android-minSdkVersion" value="22" />
<preference name="android-targetSdkVersion" value="28" />
<preference name="AndroidXEnabled" value="true" />
<resource-file src="google-services.json" target="app/google-services.json" />
<hook src="hooks/before_build/android/android_set_provider.js" type="before_build" />
<icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
Expand Down
10 changes: 6 additions & 4 deletions package.cordovabuild.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
],
"plugins": {
"phonegap-plugin-push": {
"FCM_VERSION": "11.0.1"
"FCM_VERSION": "17.0.0"
},
"cordova-plugin-ionic-keyboard": {},
"cordova-plugin-app-version": {},
Expand Down Expand Up @@ -50,23 +50,25 @@
},
"cordova-plugin-whitelist": {},
"cordova-plugin-em-jwt-auth": {
"AUTH_VERSION": "11.0.1"
"AUTH_VERSION": "17.0.0"
},
"cordova-plugin-em-server-communication": {},
"cordova-plugin-em-datacollection": {
"LOCATION_VERSION": "11.0.1"
"LOCATION_VERSION": "17.0.0"
},
"cordova-plugin-em-serversync": {},
"cordova-plugin-em-settings": {},
"cordova-plugin-em-transition-notify": {},
"cordova-plugin-em-unifiedlogger": {},
"cordova-plugin-em-usercache": {}
"cordova-plugin-em-usercache": {},
"cordova-plugin-androidx-adapter": {}
}
},
"dependencies": {
"cordova-android": "9.0.0",
"cordova-ios": "5.1.1",
"cordova-plugin-advanced-http": "3.0.0",
"cordova-plugin-androidx-adapter": "git+https://github.com/dpa99c/cordova-plugin-androidx-adapter.git",
"cordova-plugin-app-version": "0.1.9",
"cordova-plugin-customurlscheme": "5.0.1",
"cordova-plugin-device": "2.0.1",
Expand Down

0 comments on commit 0ae2109

Please sign in to comment.