cordova-android 7 compatibility #76

EddyVerbruggen · Apr 6, 2018 · c168427 · c168427
1 parent 8f02442
commit c168427
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-native-keyboard",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "This plugin aims to solve common keyboard problems encountered with Cordova / PhoneGap apps. The messenger component (see screenshots) is ready for production, but this plugin will have more tricks up its sleeve. I'll document those once they're ready for primetime as well.",
   "cordova": {
     "id": "cordova-plugin-native-keyboard",

diff --git a/plugin.xml b/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-native-keyboard"
-        version="1.5.1">
+        version="1.5.2">
 
   <name>Native Keyboard</name>
 
@@ -48,16 +48,19 @@
     <source-file src="src/android/res/values/font_awesome.xml" target-dir="res/values" />
     <source-file src="src/android/res/drawable/cursor.xml" target-dir="res/drawable" />
 
+    <source-file src="src/android/res/values/nativekeyboard.xml" target-dir="res/values" />
+
     <!-- cordova-android < 7 -->
     <source-file src="src/android/assets/fonts/fontawesome-webfont.ttf" target-dir="assets/fonts" />
     <source-file src="src/android/assets/fonts/ionicons.ttf" target-dir="assets/fonts" />
+    <config-file target="res/values/nativekeyboard.xml" parent="/*">
+      <string name="NativeKeyboardPluginLicense">$LICENSE</string>
+    </config-file>
 
     <!-- cordova-android >= 7 -->
     <source-file src="src/android/assets/fonts/fontawesome-webfont.ttf" target-dir="app/src/main/assets/fonts" />
     <source-file src="src/android/assets/fonts/ionicons.ttf" target-dir="app/src/main/assets/fonts" />
-
-    <source-file src="src/android/res/values/nativekeyboard.xml" target-dir="res/values" />
-    <config-file target="res/values/nativekeyboard.xml" parent="/*">
+    <config-file target="app/src/main/res/values/nativekeyboard.xml" parent="/*">
       <string name="NativeKeyboardPluginLicense">$LICENSE</string>
     </config-file>
   </platform>