Skip to content

Commit

Permalink
small cordova tweaks (hopefully it will be little bit more stable) (#258
Browse files Browse the repository at this point in the history
)
  • Loading branch information
Sebastian Ovide authored Oct 25, 2019
1 parent 5c9da38 commit 42724db
Show file tree
Hide file tree
Showing 8 changed files with 1,173 additions and 703 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ matrix:
dist: trusty
sudo: false
node_js:
- 8
- 12
# jdk:
# - openjdk8
android:
Expand All @@ -27,7 +27,7 @@ matrix:
directories:
- node_modules/
before_install:
- nvm install 8
- nvm install 12
# - yes | sdkmanager "platforms;android-27"
- yes | sdkmanager tools > /dev/null
- yes | sdkmanager --licenses > /dev/null
Expand Down Expand Up @@ -90,7 +90,7 @@ matrix:
directories:
- node_modules/
before_install:
- nvm install 8
- nvm install 12
- echo {} > cordova-app/build.json
- if [ "$TRAVIS_PULL_REQUEST" == false ]; then openssl aes-256-cbc -K $encrypted_24a643539195_key
-iv $encrypted_24a643539195_iv -in cordova-app/secrets.tar.enc -out cordova-app/secrets.tar
Expand Down
2 changes: 1 addition & 1 deletion cordova-app/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<splash src="res/screen/ios/Default@2x~universal~anyany.png"/>
<resource-file src="GoogleService-Info.plist"/>
<preference name="DisallowOverscroll" value="true"/>

<preference name="BackupWebStorage" value="local"/>
<edit-config file="*-Info.plist" mode="merge" target="NSPhotoLibraryUsageDescription">
<string>Plastic Patrol needs photo library access to get the picture of the plastic that you collect.</string>
</edit-config>
Expand Down
12 changes: 6 additions & 6 deletions cordova-app/package-lock.json

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

10 changes: 5 additions & 5 deletions cordova-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,24 @@
"cordova-plugin-whitelist": {},
"cordova-plugin-geolocation": {},
"cordova-plugin-splashscreen": {},
"cordova-plugin-statusbar": {},
"cordova-plugin-camera-with-exif": {
"ANDROID_SUPPORT_V4_VERSION": "27.+"
},
"cordova-support-android-plugin": {},
"cordova-support-google-services": {},
"cordova-plugin-statusbar": {},
"cordova-plugin-firebase-analytics": {}
}
},
"dependencies": {
"cordova-android": "^8.1.0",
"cordova-ios": "^5.0.1",
"cordova-ios-plugin-no-export-compliance": "0.0.5",
"cordova-ios-plugin-no-export-compliance": "0.0.6",
"cordova-plugin-camera-with-exif": "^1.3.1",
"cordova-plugin-firebase-analytics": "2.0.4",
"cordova-plugin-firebase-analytics": "^3.0.0",
"cordova-plugin-geolocation": "^4.0.1",
"cordova-plugin-splashscreen": "^5.0.3",
"cordova-plugin-statusbar": "^2.4.3",
"cordova-plugin-statusbar": "2.4.3",
"cordova-plugin-whitelist": "^1.3.4",
"cordova-support-android-plugin": "1.0.1",
"cordova-support-google-services": "1.3.1"
Expand All @@ -38,4 +38,4 @@
"http-server": "^0.11.1",
"xmldom": "^0.1.27"
}
}
}
Loading

0 comments on commit 42724db

Please sign in to comment.