Merge branch 'feature/cordova-9.0.0'

# Conflicts:
#	example/package.json

Author: schiewe

README.md

@@ -7,7 +7,7 @@ This project shows how to easily integrate the [PhotoEditor SDK](https://www.pho
 
 **THIS IS A DEMO**. This repository is not meant as a fully fledged Cordova plugin, but as a base for further development instead. You can copy the repository into your own project and use the `cordova plugin add /path/to/plugin --link` command to add it to your app. You will most likely need to adjust the codebase to fit your requirements and to customize the PhotoEditor SDK. For customizations, take a look at the [PESDKPlugin.m](src/ios/PESDKPlugin.m) and [PESDKPlugin.java](src/android/PESDKPlugin.java) files. You can easily alter the configurations to change colors, behaviour etc. and handle callbacks that are sent by our SDK. For further reference take a look at our [documentation](http://docs.photoeditorsdk.com/?utm_campaign=Projects&utm_source=Github&utm_medium=Side_Projects&utm_content=Cordova-Demo).
 
-> :warning: The latest iOS SDK needs to be downloaded manually from [our repository](https://github.com/imgly/pesdk-ios-build/releases) and placed in the `/src/ios/` directory.
+> :warning: The latest iOS SDK which consists of the `ImglyKit.framework` and `PhotoEditorSDK.framework` needs to be downloaded manually from [our repository](https://github.com/imgly/pesdk-ios-build/releases) and placed in the `/src/ios/` directory.
 
 ## License Files
 

example/package.json

@@ -11,9 +11,9 @@
     "license": "Apache-2.0",
     "dependencies": {
         "cordova-android": "^7.0.0",
-        "cordova-ios": "^4.5.4",
-        "cordova-plugin-add-swift-support": "^1.7.1",
-        "cordova-plugin-whitelist": "^1.3.4"
+        "cordova-plugin-whitelist": "^1.3.4",
+        "cordova-ios": "^5.0.1",
+        "cordova-plugin-add-swift-support": "^2.0.2"
     },
     "cordova": {
         "plugins": {
@@ -25,4 +25,4 @@
             "android"
         ]
     }
-}
+}

hooks/README.md

@@ -131,7 +131,14 @@
                                     return -1;
                                 }
                                 logger.verbose("Removed package.json.tmp");
-                                complete();
+                                installModules(function(err) {
+                                    if (err) {
+                                        deferral.reject("Error installing original modules: " + err);
+                                        return -1;
+                                    }
+                                    logger.verbose("Installed original modules");
+                                    complete();
+                                });
                             })
                         });
                     } else {
@@ -152,10 +159,10 @@
 
     module.exports = function (ctx) {
         // resolve modules
-        exec = ctx.requireCordovaModule('child_process').exec,
-        fs = ctx.requireCordovaModule('fs'),
-        path = ctx.requireCordovaModule('path'),
-        deferral = ctx.requireCordovaModule('q').defer();
+        exec = require('child_process').exec,
+        fs = require('fs'),
+        path = require('path'),
+        deferral = require('q').defer();
 
         // resolve paths
         hooksPath = path.resolve(ctx.opts.projectRoot, "plugins", ctx.opts.plugin.id, "hooks");

hooks/resolveDependencies.js

@@ -20,6 +20,8 @@
         "camera"
     ],
     "dependencies": {
-
+        "glob": "^7.1.5",
+        "q": "^1.5.1",
+        "xcode": "^2.0.0"
     }
 }

package.json

@@ -28,7 +28,7 @@
     <keywords>cordova,camera</keywords>
     <repo>https://github.com/imgly/pesdk-cordova-demo.git</repo>
 
-    <dependency id="cordova-plugin-add-swift-support" version="1.7.1"/>
+    <dependency id="cordova-plugin-add-swift-support" version="2.0.2"/>
 
     <js-module src="src/www/pesdk.js" name="PESDK">
         <clobbers target="PESDK" />
@@ -70,10 +70,11 @@
          <framework src="AssetsLibrary.framework" />
          <framework src="MobileCoreServices.framework" />
          <framework src="src/ios/PhotoEditorSDK.framework" custom="true" embed="true" />
+         <framework src="src/ios/ImglyKit.framework" custom="true" embed="true" />
 
+         <!-- Custom Hooks -->
          <hook type="after_plugin_install" src="hooks/resolveDependencies.js" />
          <hook type="after_platform_add" src="hooks/resolveDependencies.js" />
-
      </platform>
 
     <!-- Browser -->