cordova-ios 5, fixes to make CLI build work

5 files changed, 11 insertions, 11 deletions

diff --git a/build-auto.json b/build-auto.json
index 2391f28a..70e09814 100644
--- a/build-auto.json
+++ b/build-auto.json
@@ -7,8 +7,6 @@
             "automaticProvisioning": true,
             "buildFlag": [
                 "-UseModernBuildSystem=0",
-                "EMBEDDED_CONTENT_CONTAINS_SWIFT = YES",
-                "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES=NO",
                 "LD_RUNPATH_SEARCH_PATHS = \"@executable_path/Frameworks\""
             ]
         },
@@ -19,8 +17,6 @@
             "automaticProvisioning": true,
             "buildFlag": [
                 "-UseModernBuildSystem=0",
-                "EMBEDDED_CONTENT_CONTAINS_SWIFT = YES",
-                "ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES=NO",
                 "LD_RUNPATH_SEARCH_PATHS = \"@executable_path/Frameworks\""
             ]
         }
diff --git a/build_ios.sh b/build_ios.sh
index a72a7169..75104627 100755
--- a/build_ios.sh
+++ b/build_ios.sh
@@ -10,7 +10,8 @@ cordova plugin add cordova-plugin-media-pp-fork
 #ionic cordova plugin add cordova-plugin-certificates
 
 echo "-- building --"
-ionic cordova build ios --release --buildConfig="./build-auto.json"
+#ionic cordova build ios --release --buildConfig="./build-auto.json"
+ionic cordova build ios --buildConfig="./build-auto.json"
 
 echo "********* Done *************"
 echo "Make sure you are using Legacy build in XCode (File->Workspace) or push/etc may stop working"
diff --git a/config.xml b/config.xml
index 05638f16..feeebbd8 100644
--- a/config.xml
+++ b/config.xml
@@ -178,5 +178,5 @@
     </plugin>
     <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" />
     <engine name="android" spec="7.1.4" />
-    <engine name="ios" spec="4.5.5" />
+    <engine name="ios" spec="5.0.0" />
 </widget>
diff --git a/docs/remote extension.txt b/docs/remote extension.txt
index 9fed3bcc..6b8be257 100644
--- a/docs/remote extension.txt
+++ b/docs/remote extension.txt
@@ -10,15 +10,18 @@ Open up platforms/ios/zmNinja.xcworkspace
 File->New->Target->Notification Service Extension, select Objective C 
 In the "Product Name" put in zmNinjaNotification (your BundleID should now read  com.pliablepixels.zmninja-pro.zmNinjaNotification)
 Say "Yes" to "Activate zmNinjaNotification scheme?" popup
+
+Now go to zmNinjaNotification target and make version and  build same as zmNinja
+
 Now in XCode Targets, select zmNinjaNotification, and make sure you select a Team and make sure Deployment Target is 10 or above
 
+Change Deployment target to 10.1 (same as zmNinja target)
+
 
-  532  cp www/external/NotificationService.swift platforms/ios/zmNinjaNotication/
-  533  cp www/external/NotificationService.swift platforms/ios/zmNinjaNotification/
+  532  cp www/external/NotificationService.m platforms/ios/zmNinjaNotication/
   534  cd platforms/ios/
   535  pod install
 
 
-- Manually change remote notification extension version to match app version
 
 
diff --git a/package.json b/package.json
index 101ec59b..42eaa48e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "zmninjapro",
   "description": "Home security mobile app for ZoneMinder",
-  "version": "1.3.050",
+  "version": "1.3.051",
   "displayName": "zmNinja",
   "author": "Pliable Pixels",
   "license": "custom see LICENSE.md",
@@ -67,7 +67,7 @@
     "clivas": "^0.2.0",
     "cordova-android": "7.1.4",
     "cordova-custom-config": "^5.0.2",
-    "cordova-ios": "4.5.5",
+    "cordova-ios": "5.0.0",
     "cordova-library-helper-pp-fork": "^1.0.1",
     "cordova-plugin-add-swift-support": "^1.7.2",
     "cordova-plugin-advanced-http": "git+https://github.com/silkimen/cordova-plugin-advanced-http.git",