Merge pull request #4 from kohofinancial/update-for-latest-cordova-an…

…droid

Update for latest cordova android

README.md

@@ -1,6 +1,3 @@
-#Update to Version 1.2.0
-Please consult the [changelog](https://github.com/mjwheatley/cordova-plugin-android-fingerprint-auth/blob/master/changelog.md).
-
 #About
 This plugin was created referencing the [Fingerprint Dialog sample](http://developer.android.com/samples/FingerprintDialog/index.html) and the [Confirm Credential sample](http://developer.android.com/samples/ConfirmCredential/index.html) referenced by the [Android 6.0 APIs webpage](http://developer.android.com/about/versions/marshmallow/android-6.0.html).
 

changelog.md

@@ -1,3 +1,6 @@
+#Version 2.0.0
+* Update for compatibility with Cordova Android version 7
+
 #Version 1.2.8
 * **Bug fix** for issue #52 - Revert to 1.2.6 and dismiss opened dialog on pause event to avoid doubling it on resume if app was closed by OS
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-android-fingerprint-auth",
-  "version": "1.2.8",
+  "version": "2.0.0",
   "description": "Cordova plugin to use Android fingerprint authentication API",
   "cordova": {
     "id": "cordova-plugin-android-fingerprint-auth",

plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="cordova-plugin-android-fingerprint-auth"
-        version="1.2.8">
+        version="2.0.0">
     <name>FingerprintAuth</name>
     <description>Cordova plugin to use Android fingerprint authentication API</description>
     <license>Apache 2.0</license>
@@ -23,39 +23,35 @@
         </config-file>
         <config-file target="AndroidManifest.xml" parent="/*">
             <uses-permission android:name="android.permission.USE_FINGERPRINT" />
-            <!--<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="23" />-->
         </config-file>
 
-        <source-file src="build-extras.gradle" target-dir="." />
         <source-file src="src/android/FingerprintAuth.java" target-dir="src/com/cordova/plugin/android/fingerprintauth" />
         <source-file src="src/android/FingerprintAuthenticationDialogFragment.java" target-dir="src/com/cordova/plugin/android/fingerprintauth" />
         <source-file src="src/android/FingerprintUiHelper.java" target-dir="src/com/cordova/plugin/android/fingerprintauth" />
-        <source-file src="res/android/drawable/ic_fingerprint_error.xml" target-dir="res/drawable" />
-        <source-file src="res/android/drawable/ic_fingerprint_success.xml" target-dir="res/drawable" />
-        <source-file src="res/android/drawable-hdpi/ic_fp_40px.png" target-dir="res/drawable-hdpi" />
-        <source-file src="res/android/drawable-mdpi/ic_fp_40px.png" target-dir="res/drawable-mdpi" />
-        <source-file src="res/android/drawable-nodpi/android_robot.png" target-dir="res/drawable-nodpi" />
-        <source-file src="res/android/drawable-xhdpi/ic_fp_40px.png" target-dir="res/drawable-xhdpi" />
-        <source-file src="res/android/drawable-xxhdpi/ic_fp_40px.png" target-dir="res/drawable-xxhdpi" />
-        <source-file src="res/android/drawable-xxxhdpi/ic_fp_40px.png" target-dir="res/drawable-xxxhdpi" />
-        <source-file src="res/android/layout/fingerprint_dialog_container.xml" target-dir="res/layout" />
-        <source-file src="res/android/layout/fingerprint_dialog_content.xml" target-dir="res/layout" />
-        <source-file src="res/android/values/fpauth-colors.xml" target-dir="res/values" />
-        <source-file src="res/android/values/fpauth-strings.xml" target-dir="res/values" />
-        <source-file src="res/android/values-it" target-dir="res" />
-        <source-file src="res/android/values-es" target-dir="res" />
-        <source-file src="res/android/values-ru" target-dir="res" />
-        <source-file src="res/android/values-fr" target-dir="res" />
-        <source-file src="res/android/values-zh" target-dir="res" />
-        <source-file src="res/android/values-zh-rCN" target-dir="res" />
-        <source-file src="res/android/values-zh-rHK" target-dir="res" />
-        <source-file src="res/android/values-zh-rMO" target-dir="res" />
-        <source-file src="res/android/values-zh-rSG" target-dir="res" />
-        <source-file src="res/android/values-zh-rTW" target-dir="res" />
-        <source-file src="res/android/values-no" target-dir="res" />
-        <source-file src="res/android/values-pt" target-dir="res" />
-        <source-file src="res/android/values-ja" target-dir="res" />
-
+        <resource-file src="res/android/drawable/ic_fingerprint_success.xml" target="res/drawable/ic_fingerprint_success.xml" />
+        <resource-file src="res/android/drawable-hdpi/ic_fp_40px.png" target="res/drawable-hdpi/ic_fp_40px.png" />
+        <resource-file src="res/android/drawable-mdpi/ic_fp_40px.png" target="res/drawable-mdpi/ic_fp_40px.png" />
+        <resource-file src="res/android/drawable-nodpi/android_robot.png" target="res/drawable-nodpi/android_robot.png" />
+        <resource-file src="res/android/drawable-xhdpi/ic_fp_40px.png" target="res/drawable-xhdpi/ic_fp_40px.png" />
+        <resource-file src="res/android/drawable-xxhdpi/ic_fp_40px.png" target="res/drawable-xxhdpi/ic_fp_40px.png" />
+        <resource-file src="res/android/drawable-xxxhdpi/ic_fp_40px.png" target="res/drawable-xxxhdpi/ic_fp_40px.png" />
+        <resource-file src="res/android/layout/fingerprint_dialog_container.xml" target="res/layout/fingerprint_dialog_container.xml" />
+        <resource-file src="res/android/layout/fingerprint_dialog_content.xml" target="res/layout/fingerprint_dialog_content.xml" />
+        <resource-file src="res/android/values/fpauth-colors.xml" target="res/values/fpauth-colors.xml" />
+        <resource-file src="res/android/values/fpauth-strings.xml" target="res/values/fpauth-strings.xml" />
+        <resource-file src="res/android/values-it" target="res/values-it" />
+        <resource-file src="res/android/values-es" target="res/values-es" />
+        <resource-file src="res/android/values-ru" target="res/values-ru" />
+        <resource-file src="res/android/values-fr" target="res/values-fr" />
+        <resource-file src="res/android/values-zh" target="res/values-zh" />
+        <resource-file src="res/android/values-zh-rCN" target="res/values-zh-rCN" />
+        <resource-file src="res/android/values-zh-rHK" target="res/values-zh-rHK" />
+        <resource-file src="res/android/values-zh-rMO" target="res/values-zh-rMO" />
+        <resource-file src="res/android/values-zh-rSG" target="res/values-zh-rSG" />
+        <resource-file src="res/android/values-zh-rTW" target="res/values-zh-rTW" />
+        <resource-file src="res/android/values-no" target="res/values-no" />
+        <resource-file src="res/android/values-pt" target="res/values-pt" />
+        <resource-file src="res/android/values-ja" target="res/values-ja" />
     </platform>
 
 </plugin>