Skip to content
Snippets Groups Projects
Commit c1452b3a authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

Merge branch 'bpresles/cesium-master'

# Conflicts:
#	yarn.lock
parents 13b89cfd fb963e65
No related branches found
No related tags found
1 merge request!631Upgraded cordova-ios. Dropped cordova-osx support
......@@ -132,15 +132,6 @@
<false />
</config-file>
</platform>
<platform name="osx">
<icon height="16" src="resources/osx/icon-16.png" width="16" />
<icon height="32" src="resources/osx/icon-32.png" width="32" />
<icon height="64" src="resources/osx/icon-64.png" width="64" />
<icon height="128" src="resources/osx/icon-128.png" width="128" />
<icon height="256" src="resources/osx/icon-256.png" width="256" />
<icon height="512" src="resources/osx/icon-512.png" width="512" />
<icon height="1024" src="resources/osx/icon-1024.png" width="1024" />
</platform>
<plugin name="cordova-plugin-camera" spec="^4.1.0">
<variable name="CAMERA_USAGE_DESCRIPTION" value="Add picture to the user profile" />
<variable name="PHOTOLIBRARY_USAGE_DESCRIPTION" value="Take a picture for the user profile" />
......@@ -169,6 +160,4 @@
</plugin>
<plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
<plugin name="cordova-plugin-androidx" spec="^1.0.2" />
<engine name="ios" spec="^6.1.0" />
<engine name="osx" spec="^6.0.0" />
</widget>
......@@ -95,8 +95,7 @@
"cordova": "^10.0.0",
"cordova-android": "^9.0.0",
"cordova-clipboard": "^1.3.0",
"cordova-ios": "^6.1.1",
"cordova-osx": "^6.0.0",
"cordova-ios": "^6.2.0",
"cordova-plugin-androidx": "^3.0.0",
"cordova-plugin-androidx-adapter": "^1.1.3",
"cordova-plugin-camera": "^5.0.1",
......@@ -214,9 +213,8 @@
"cordova-plugin-minisodium": {}
},
"platforms": [
"ios",
"osx",
"android"
"android",
"ios"
]
},
"engines": {
......
......@@ -120,7 +120,7 @@ angular.module("cesium.config", [])
}
},
"version": "1.6.12",
"build": "2021-03-01T17:45:19.094Z",
"build": "2021-03-03T20:44:36.248Z",
"newIssueUrl": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new"
})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment