diff --git a/BlinkID/initIOSFramework.sh b/BlinkID/initIOSFramework.sh index 60e7faa..32ad782 100755 --- a/BlinkID/initIOSFramework.sh +++ b/BlinkID/initIOSFramework.sh @@ -9,7 +9,7 @@ VERSION='2.14.0' if [ ! -d 'blinkid-ios' ] ; then echo "Cloning repo with Microblink framework v${VERSION}" # clone blinkID repository - git clone "git@github.com:BlinkID/blinkid-ios.git" + git clone "https://github.com/BlinkID/blinkid-ios.git" fi echo "Checking out v${VERSION}" diff --git a/BlinkID/package.json b/BlinkID/package.json index 7cfc127..47f6c91 100644 --- a/BlinkID/package.json +++ b/BlinkID/package.json @@ -1,6 +1,6 @@ { "name": "blinkid", - "version": "1.3.0", + "version": "1.4.1", "description": "A small and powerful ID card scanning library", "cordova": { "id": "com.microblink.blinkid", @@ -26,7 +26,7 @@ }, { "name": "cordova-android", - "version": ">=4.0.0" + "version": ">=7.0.0" }, { "name": "cordova-ios", diff --git a/BlinkID/plugin.xml b/BlinkID/plugin.xml index c5a5ff7..8568ab9 100644 --- a/BlinkID/plugin.xml +++ b/BlinkID/plugin.xml @@ -2,7 +2,7 @@ + version="1.4.1"> BlinkIdScanner A small and powerful ID card scanning library @@ -11,8 +11,8 @@ MicroBlink Team info@microblink.com - - + + @@ -28,7 +28,7 @@ - + @@ -44,7 +44,7 @@ android:smallScreens="true" /> - + - - + + - - + + diff --git a/BlinkID/scripts/fix-largeheap.js b/BlinkID/scripts/fix-largeheap.js index 5f6fa68..947882c 100755 --- a/BlinkID/scripts/fix-largeheap.js +++ b/BlinkID/scripts/fix-largeheap.js @@ -10,7 +10,7 @@ module.exports = function(ctx) { deferral = ctx.requireCordovaModule('q').defer(); var platformRoot = path.join(ctx.opts.projectRoot, 'platforms/android'); - var androidManifest = path.join(platformRoot, 'AndroidManifest.xml'); + var androidManifest = path.join(platformRoot, 'app/src/main/AndroidManifest.xml'); console.log("BlinkID after_prepare hook: "); fs.stat(androidManifest, function(err, stats) { diff --git a/README.md b/README.md index af23cf8..7363654 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,9 @@ This repository contains example wrapper for BlinkID native SDKs ([iOS](https://github.com/BlinkID/blinkid-ios) and [Android](https://github.com/BlinkID/blinkid-android)). Not all features of native SDKs are available in PhoneGap wrapper. However, the wrapper is open source, so you can easily add features that you need. For 100% of features and maximum control, consider using native SDKs. +## Cordova version +BlinkID PhoneGap requires Cordova **v7.0.0 or later** and cordova-android plugin **v7.0.0 or later**. + ## Dependencies MicroBlink.framework/MicroBlink file in iOS submodule exceeds GitHubs limited file size of 100MB. To correctly init the submodule Git LFS is needed. Git LFS can be installed with homebrew: @@ -107,7 +110,7 @@ cp -f -r /www/js ./www/ Add Android platform support to the project: - cordova platform add android + cordova platform add android@7 ### iOS @@ -132,7 +135,7 @@ cd testcordova cordova plugin add ../blinkid-phonegap/BlinkID # add android support to the project -cordova platform add android +cordova platform add android@7 # build the project, the binary will appear in the bin/ folder cordova build android diff --git a/Release notes.md b/Release notes.md index d6ecde0..64b0349 100644 --- a/Release notes.md +++ b/Release notes.md @@ -1,3 +1,9 @@ +## 1.4.1 +- upgraded support for Cordova v7.0.0 or higher +- upgraded support for Cordova Android platform v7.0.0 or higher + * sources for Android are now compliant with the Android Studio project structure +- replaced the SSH link with the HTTPS link in the iOS init script (solves `public-key denied` issues) + ## 1.4.0 - updated Android SDK to [v3.13.0](https://github.com/BlinkID/blinkid-android/releases/tag/v3.13.0) - updated iOS SDK to [v2.14.0](https://github.com/BlinkID/blinkid-ios/releases/tag/v2.14.0) diff --git a/initCordovaDemoApp.sh b/initCordovaDemoApp.sh index ed4f127..0002acb 100755 --- a/initCordovaDemoApp.sh +++ b/initCordovaDemoApp.sh @@ -26,7 +26,7 @@ cd $APP_NAME cordova plugin add ../BlinkID --variable CAMERA_USAGE_DESCRIPTION="Camera permission is required for automated scanning" # add ios and android support to the project -cordova platform add android +cordova platform add android@7 cordova platform add ios # copy content of the www folder diff --git a/initIonicDemoApp.sh b/initIonicDemoApp.sh index e8b255f..378c1e7 100755 --- a/initIonicDemoApp.sh +++ b/initIonicDemoApp.sh @@ -27,7 +27,7 @@ sed -i "" "s/MyApp/$APP_NAME/" config.xml ionic cordova plugin add ../BlinkID # add ios and android support to the project -ionic cordova platform add android +ionic cordova platform add android@7 ionic cordova platform add ios # copy content of the www folder