Merge pull request #1156 from SteveGilvarry/master

Updates from Steve

Author: connortechnology

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '20'
           cache: 'npm'
       - run: npm ci
       - run: npm test || echo "No tests configured yet"
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '20'
           cache: 'npm'
       - uses: actions/setup-java@v4
         with:
@@ -56,10 +56,9 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '20'
       - run: npm install
       - run: npm ci
-      - run: sudo xcodebuild -workspace App.xcworkspace -scheme App -configuration Debug -destination 'generic/platform=iOS Simulator' build
       - run: npm install -g cordova@12.0.0
       - run: cordova platform add ios
       - run: cordova build ios --debug

.gitignore

@@ -21,6 +21,7 @@ dist/
 .gradle/
 **/docgen/
 .env
+.idea/
 
 
 www/templates/zmNinja.code-workspace

build_android.sh

@@ -121,7 +121,6 @@ ver=${APPVER//.}9
 
 echo "About to build version: $APPVER [$ver] ($MODE)"
 echo $ver
-read -p "Press any key..."
 
 echo "Removing wkwebview..."
 cordova plugin remove cordova-plugin-ionic-webview > /dev/null 2>&1

config.xml

@@ -27,8 +27,8 @@
     <preference name="SplashMaintainAspectRatio" value="true" />
     <preference name="FadeSplashScreen" value="false" />
     <preference name="BackgroundColor" value="#444444" />
-    <preference name="android-targetSdkVersion" value="34" />
-    <preference name="android-compileSdkVersion" value="34" />
+    <preference name="android-targetSdkVersion" value="35" />
+    <preference name="android-compileSdkVersion" value="35" />
     <preference name="android-minSdkVersion" value="22" />
     <preference name="SplashScreenBackgroundColor" value="#ababab" />
     <preference name="StatusBarOverlaysWebView" value="false" />

hooks/after_platform_add/010_create_notification_extension.js

@@ -76,6 +76,7 @@ module.exports = function(context) {
         if (cfg.buildSettings.PRODUCT_NAME === `"${extName}"`) {
           cfg.buildSettings.PRODUCT_BUNDLE_IDENTIFIER = desiredExtBundleId;
           cfg.buildSettings.INFOPLIST_FILE = `"${extName}/${extName}-Info.plist"`;
+          cfg.buildSettings.DEVELOPMENT_TEAM = 'P97TSUFFDX';
 
           // sensible defaults for extensions
           cfg.buildSettings.SDKROOT = 'iphoneos';