Skip to content

Commit fb963e6

Browse files
author
Bertrand Presles
committed
Upgraded cordova-ios. Dropped cordova-osx support
1 parent 43c4640 commit fb963e6

File tree

4 files changed

+43
-46
lines changed

4 files changed

+43
-46
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

‎yarn.lock‎

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2467,17 +2467,17 @@ cordova-fetch@^3.0.0:
24672467
semver "^7.1.3"
24682468
which "^2.0.2"
24692469

2470-
cordova-ios@^6.1.1:
2471-
version "6.1.1"
2472-
resolved "https://registry.npmjs.org/cordova-ios/-/cordova-ios-6.1.1.tgz#3347303ddbc3a98073fcb5e0d3af47db66ea2491"
2473-
integrity sha512-WHNvjVhkuwRpq95rISVXtcRyd6UGZapbmU+hO/CAn1c0AIT5WnO8mg2mOjv0WDNa0mt/V5P+N2Vig1UWwfxa5Q==
2470+
cordova-ios@^6.2.0:
2471+
version "6.2.0"
2472+
resolved "https://registry.yarnpkg.com/cordova-ios/-/cordova-ios-6.2.0.tgz#3aaec7376b9a202cdcaf28faab6a79823b04c519"
2473+
integrity sha512-sLjZg2QBI1SpQVwfe0MSn89YNVkBGLW9Q1vcFJBsqKBrhvoEOJ5Ytq0gwqdhgTOGzlwJUfxC6OHM3jcsRjtYrw==
24742474
dependencies:
24752475
cordova-common "^4.0.2"
2476-
fs-extra "^9.0.0"
2476+
fs-extra "^9.1.0"
24772477
ios-sim "^8.0.2"
2478-
nopt "^4.0.3"
2478+
nopt "^5.0.0"
24792479
plist "^3.0.1"
2480-
semver "^7.3.2"
2480+
semver "^7.3.4"
24812481
unorm "^1.6.0"
24822482
which "^2.0.2"
24832483
xcode "^3.0.1"
@@ -2505,20 +2505,6 @@ cordova-lib@^10.0.0:
25052505
stringify-package "^1.0.1"
25062506
write-file-atomic "^3.0.3"
25072507

2508-
cordova-osx@^6.0.0:
2509-
version "6.0.0"
2510-
resolved "https://nexus.e-is.pro/nexus/content/repositories/npmjs/cordova-osx/-/cordova-osx-6.0.0.tgz#28aea6c9d3c86ec339a1dc1b4996aae4282cf0fc"
2511-
integrity sha512-WQTJSh0E2HymwIQF2mTGXYE8i8uG5RaRjE2CFJt/VXTn1xs/nnjcSsALsPLh7en2kv/N6YKe5bBesYYNULrWdQ==
2512-
dependencies:
2513-
cordova-common "^4.0.0"
2514-
nopt "^4.0.1"
2515-
plist "^3.0.1"
2516-
q "^1.4.1"
2517-
shelljs "^0.5.3"
2518-
underscore "^1.9.1"
2519-
unorm "^1.4.1"
2520-
xcode "^3.0.1"
2521-
25222508
cordova-plugin-androidx-adapter@^1.1.3:
25232509
version "1.1.3"
25242510
resolved "https://registry.npmjs.org/cordova-plugin-androidx-adapter/-/cordova-plugin-androidx-adapter-1.1.3.tgz#aa7e673ee342de208a6a34a50986ee2ac4b5ba60"
@@ -4286,6 +4272,16 @@ fs-extra@^9.0.0, fs-extra@^9.0.1:
42864272
jsonfile "^6.0.1"
42874273
universalify "^1.0.0"
42884274

4275+
fs-extra@^9.1.0:
4276+
version "9.1.0"
4277+
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
4278+
integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
4279+
dependencies:
4280+
at-least-node "^1.0.0"
4281+
graceful-fs "^4.2.0"
4282+
jsonfile "^6.0.1"
4283+
universalify "^2.0.0"
4284+
42894285
fs-extra@~4.0.2:
42904286
version "4.0.3"
42914287
resolved "https://nexus.e-is.pro/nexus/content/repositories/npmjs/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
@@ -7729,6 +7725,13 @@ nopt@^4.0.1, nopt@^4.0.3:
77297725
abbrev "1"
77307726
osenv "^0.1.4"
77317727

7728+
nopt@^5.0.0:
7729+
version "5.0.0"
7730+
resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
7731+
integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
7732+
dependencies:
7733+
abbrev "1"
7734+
77327735
normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
77337736
version "2.5.0"
77347737
resolved "https://nexus.e-is.pro/nexus/content/repositories/npmjs/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -8712,7 +8715,7 @@ pupa@^2.0.1:
87128715
dependencies:
87138716
escape-goat "^2.0.0"
87148717

8715-
q@^1.1.2, q@^1.4.1, q@^1.5.1:
8718+
q@^1.1.2, q@^1.5.1:
87168719
version "1.5.1"
87178720
resolved "https://nexus.e-is.pro/nexus/content/repositories/npmjs/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
87188721
integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
@@ -9440,6 +9443,13 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
94409443
resolved "https://nexus.e-is.pro/nexus/content/repositories/npmjs/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
94419444
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
94429445

9446+
semver@^7.3.4:
9447+
version "7.3.4"
9448+
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
9449+
integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
9450+
dependencies:
9451+
lru-cache "^6.0.0"
9452+
94439453
semver@~5.3.0:
94449454
version "5.3.0"
94459455
resolved "https://nexus.e-is.pro/nexus/content/repositories/npmjs/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -9562,11 +9572,6 @@ shelljs@^0.2.6:
95629572
resolved "https://nexus.e-is.pro/nexus/content/repositories/npmjs/shelljs/-/shelljs-0.2.6.tgz#90492d72ffcc8159976baba62fb0f6884f0c3378"
95639573
integrity sha1-kEktcv/MgVmXa6umL7D2iE8MM3g=
95649574

9565-
shelljs@^0.5.3:
9566-
version "0.5.3"
9567-
resolved "https://nexus.e-is.pro/nexus/content/repositories/npmjs/shelljs/-/shelljs-0.5.3.tgz#c54982b996c76ef0c1e6b59fbdc5825f5b713113"
9568-
integrity sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM=
9569-
95709575
shelljs@^0.8.3:
95719576
version "0.8.4"
95729577
resolved "https://nexus.e-is.pro/nexus/content/repositories/npmjs/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
@@ -10787,7 +10792,7 @@ [email protected]:
1078710792
resolved "https://nexus.e-is.pro/nexus/content/repositories/npmjs/underscore/-/underscore-1.2.1.tgz#fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4"
1078810793
integrity sha1-/FxrB2VnPZKi1KyLTcCqiHAuK9Q=
1078910794

10790-
underscore@^1.9.1, underscore@^1.9.2:
10795+
underscore@^1.9.2:
1079110796
version "1.10.2"
1079210797
resolved "https://nexus.e-is.pro/nexus/content/repositories/npmjs/underscore/-/underscore-1.10.2.tgz#73d6aa3668f3188e4adb0f1943bd12cfd7efaaaf"
1079310798
integrity sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg==
@@ -10847,7 +10852,12 @@ universalify@^1.0.0:
1084710852
resolved "https://nexus.e-is.pro/nexus/content/repositories/npmjs/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
1084810853
integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
1084910854

10850-
unorm@^1.4.1, unorm@^1.6.0:
10855+
universalify@^2.0.0:
10856+
version "2.0.0"
10857+
resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
10858+
integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
10859+
10860+
unorm@^1.6.0:
1085110861
version "1.6.0"
1085210862
resolved "https://nexus.e-is.pro/nexus/content/repositories/npmjs/unorm/-/unorm-1.6.0.tgz#029b289661fba714f1a9af439eb51d9b16c205af"
1085310863
integrity sha512-b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==

0 commit comments

Comments
 (0)