Merge branch 'master' into androidUiflags

tidev · Jan 5, 2025 · 070a339 · 070a339
2 parents daa0904 + f91b91a
commit 070a339
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 39 deletions.
diff --git a/iphone/iphone/Titanium.plist b/iphone/iphone/Titanium.plist
@@ -59,10 +59,6 @@
 	<string>Can we use your microphone?</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>Can we save to your photo library?</string>
-	<key>UIAppFonts</key>
-	<array>
-		<string>comic_zine_ot.otf</string>
-	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiresFullScreen</key>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -99,7 +99,7 @@
     "colors": "1.4.0",
     "ejs": "3.1.9",
     "fields": "0.1.24",
-    "fs-extra": "11.2.0",
+    "fs-extra": "10.0.0",
     "ioslib": "1.7.39",
     "liveview": "1.5.6",
     "lodash.merge": "4.6.2",
@@ -155,7 +155,7 @@
     "nyc": "15.1.0",
     "request-promise-native": "1.0.9",
     "rollup": "2.76.0",
-    "ssri": "10.0.4",
+    "ssri": "8.0.1",
     "stream-splitter": "0.3.2",
     "strip-ansi": "6.0.1",
     "titanium": "6.1.1",