Merge branch 'steveupdate'

Author: connortechnology

build_ios.sh

@@ -3,7 +3,7 @@ if [ "$1" != "skip" ]
 then
 #  ionic cordova plugin remove cordova-plugin-ionic-webview 2>/dev/null
   echo "Adding wkwebview..."
-  cordova plugin add https://github.com/ZoneMinder/cordova-plugin-ionic-webview.git
+  cordova plugin add cordova-plugin-ionic-webview
 
 else
   echo "Skipping plugin update process. Make sure you did not build for Android before this"
@@ -13,6 +13,6 @@ fi
 echo "-- building --"
 #ionic cordova build ios --release --buildConfig="./build-auto.json"
 cordova prepare
-cordova build ios --buildConfig="./build.json"
+cordova build ios --release --device --buildConfig="./build.json"
 echo "********* Done *************"
 

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.zoneminder.zmNinja" version="1.7.009" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.zoneminder.zmNinja" version="1.7.010" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>zmNinja</name>
     <description>
 	High performance ZoneMinder client
@@ -23,7 +23,6 @@
     <preference name="AutoHideSplashScreen" value="false" />
     <preference name="ShowSplashScreenSpinner" value="false" />
     <preference name="SplashScreen" value="screen" />
-    <preference name="deployment-target" value="15.0" />
     <preference name="SplashScreenDelay" value="300" />
     <preference name="SplashMaintainAspectRatio" value="true" />
     <preference name="FadeSplashScreen" value="false" />
@@ -37,11 +36,8 @@
     <platform name="ios">
         <hook src="hooks/after_platform_add/010_create_notification_extension.js" type="after_platform_add" />
         <preference name="Orientation" value="all" />
-        <preference name="WKWebViewOnly" value="true" />
-        <feature name="CDVWKWebViewEngine">
-            <param name="ios-package" value="CDVWKWebViewEngine" />
-        </feature>
-        <preference name="CordovaWebViewEngine" value="CDVWKWebViewEngine" />
+        <preference name="SwiftVersion" value="5.0" />
+        <preference name="deployment-target" value="15.0" />
         <resource-file src="www/sounds/blop.caf" target="blop.caf" />
         <config-file parent="NSPhotoLibraryAddUsageDescription" platform="ios" target="*-Info.plist">
             <string>Store photos of events and live feeds</string>

electron_js/notarize.js

@@ -1,8 +1,8 @@
 require('dotenv').config();
-const { notarize } = require('electron-notarize');
+const { notarize } = require('@electron/notarize');
 
 exports.default = async function notarizing(context) {
-  const { electronPlatformName, appOutDir } = context;  
+  const { electronPlatformName, appOutDir } = context;
   if (electronPlatformName !== 'darwin') {
     return;
   }

hooks/after_platform_add/010_create_notification_extension.js

@@ -38,7 +38,7 @@ module.exports = function(context) {
       }
       // Copy in the extension files
       console.log('Copying in the extension files to the iOS project');
-      fs.mkdirSync(`${iosPath}${extName}`);
+      try { fs.mkdirSync(`${iosPath}${extName}`, {recursive: true}); } catch (e) {}
       extFiles.forEach(function (extFile) {
         let targetFile = `${iosPath}${extName}/${extFile}`;
         fs.createReadStream(`${sourceDir}${extFile}`)
@@ -59,6 +59,33 @@ module.exports = function(context) {
       // Add a target for the extension
       console.log('Adding the new target');
       let target = proj.addTarget(extName, 'app_extension');
+
+
+      // Get app bundle id from <widget id="..."> in config.xml
+      const bundleId = appConfig.packageName();
+      const desiredExtBundleId = `${bundleId}.${extName}`;
+      const marketing = appConfig.version();
+
+      // Point the target at the copied plist and set the bundle id
+      const cfgs = proj.pbxXCBuildConfigurationSection();
+      Object.keys(cfgs).forEach(ref => {
+        const cfg = cfgs[ref];
+        if (!cfg || !cfg.buildSettings) return;
+
+        // Only touch the new extension target’s configs
+        if (cfg.buildSettings.PRODUCT_NAME === `"${extName}"`) {
+          cfg.buildSettings.PRODUCT_BUNDLE_IDENTIFIER = desiredExtBundleId;
+          cfg.buildSettings.INFOPLIST_FILE = `"${extName}/${extName}-Info.plist"`;
+
+          // sensible defaults for extensions
+          cfg.buildSettings.SDKROOT = 'iphoneos';
+          cfg.buildSettings.SKIP_INSTALL = 'YES';
+          cfg.buildSettings.LD_RUNPATH_SEARCH_PATHS = `"$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"`;
+          cfg.buildSettings.MARKETING_VERSION = marketing;           // CFBundleShortVersionString
+          cfg.buildSettings.CURRENT_PROJECT_VERSION = marketing;     // CFBundleVersion
+        }
+      });
+
       // Add build phases to the new target
       console.log('Adding build phases to the new target');
       proj.addBuildPhase([ 'NotificationService.m' ], 'PBXSourcesBuildPhase', 'Sources', target.uuid);