Skip to content

Commit c1452b3

Browse files
committed
Merge branch 'bpresles/cesium-master'
# Conflicts: # yarn.lock
2 parents 13b89cf + fb963e6 commit c1452b3

File tree

3 files changed

+4
-17
lines changed

3 files changed

+4
-17
lines changed

config.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,6 @@
132132
<false />
133133
</config-file>
134134
</platform>
135-
<platform name="osx">
136-
<icon height="16" src="resources/osx/icon-16.png" width="16" />
137-
<icon height="32" src="resources/osx/icon-32.png" width="32" />
138-
<icon height="64" src="resources/osx/icon-64.png" width="64" />
139-
<icon height="128" src="resources/osx/icon-128.png" width="128" />
140-
<icon height="256" src="resources/osx/icon-256.png" width="256" />
141-
<icon height="512" src="resources/osx/icon-512.png" width="512" />
142-
<icon height="1024" src="resources/osx/icon-1024.png" width="1024" />
143-
</platform>
144135
<plugin name="cordova-plugin-camera" spec="^4.1.0">
145136
<variable name="CAMERA_USAGE_DESCRIPTION" value="Add picture to the user profile" />
146137
<variable name="PHOTOLIBRARY_USAGE_DESCRIPTION" value="Take a picture for the user profile" />
@@ -169,6 +160,4 @@
169160
</plugin>
170161
<plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
171162
<plugin name="cordova-plugin-androidx" spec="^1.0.2" />
172-
<engine name="ios" spec="^6.1.0" />
173-
<engine name="osx" spec="^6.0.0" />
174163
</widget>

package.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@
9595
"cordova": "^10.0.0",
9696
"cordova-android": "^9.0.0",
9797
"cordova-clipboard": "^1.3.0",
98-
"cordova-ios": "^6.1.1",
99-
"cordova-osx": "^6.0.0",
98+
"cordova-ios": "^6.2.0",
10099
"cordova-plugin-androidx": "^3.0.0",
101100
"cordova-plugin-androidx-adapter": "^1.1.3",
102101
"cordova-plugin-camera": "^5.0.1",
@@ -214,9 +213,8 @@
214213
"cordova-plugin-minisodium": {}
215214
},
216215
"platforms": [
217-
"ios",
218-
"osx",
219-
"android"
216+
"android",
217+
"ios"
220218
]
221219
},
222220
"engines": {

www/js/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ angular.module("cesium.config", [])
120120
}
121121
},
122122
"version": "1.6.12",
123-
"build": "2021-03-01T17:45:19.094Z",
123+
"build": "2021-03-03T20:44:36.248Z",
124124
"newIssueUrl": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new"
125125
})
126126

0 commit comments

Comments
 (0)