Merge pull request #94 from securCom/master

cordova/android 7.1 and gradle compatibility
EddyVerbruggen · Feb 9, 2019 · 3fd5419 · 3fd5419
2 parents 8cd3903 + 54535d8
commit 3fd5419
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -50,19 +50,10 @@
     <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" />
+    <source-file src="src/android/res/values/nativekeyboard.xml" target-dir="app/src/main/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">$LIC_ANDROID</string>
-      <string name="NativeKeyboardPluginLicenseAlt">$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" />
     <config-file target="app/src/main/res/values/nativekeyboard.xml" parent="/*">
       <string name="NativeKeyboardPluginLicense">$LIC_ANDROID</string>
       <string name="NativeKeyboardPluginLicenseAlt">$LICENSE</string>