From ac43778d223a9e93cfed1618ac40474232bfc099 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Mon, 7 Aug 2017 14:49:29 +0200
Subject: [PATCH] fix android manifest
---
hooks/after_prepare/060_prepare_android_manifest.js | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/hooks/after_prepare/060_prepare_android_manifest.js b/hooks/after_prepare/060_prepare_android_manifest.js
index 1346524d2..85d932790 100755
--- a/hooks/after_prepare/060_prepare_android_manifest.js
+++ b/hooks/after_prepare/060_prepare_android_manifest.js
@@ -27,15 +27,16 @@ if (rootdir) {
// Add 'tools' namespace to root tag
.pipe(replace(/(xmlns:android="http:\/\/schemas.android.com\/apk\/res\/android")\s*>/g, '$1 xmlns:tools="http://schemas.android.com/tools">'))
- // <uses-sdk> : if many, keep only one
- .pipe(replace(/(<uses-sdk [^>]+>)(:?[\n\r\s\t ]*<uses-sdk [^>]+>)+/mg, '$1'))
+ // remove all <uses-sdk>
+ .pipe(replace(/<uses-sdk [^>]+\/>/g, ''))
- // <uses-sdk> : Replace 'targetSdkversion' and add tools:overrideLibrary
- .pipe(replace(/android:targetSdkVersion="[0-9]+"( tools:overrideLibrary="org.kaliumjni.lib")?\s*\/>/g, 'android:targetSdkVersion="25" tools:overrideLibrary="org.kaliumjni.lib" />'))
+ // add <uses-sdk> (replace 'targetSdkversion' and add tools:overrideLibrary)
+ .pipe(replace(/(<\/manifest>)/, ' <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="25" tools:overrideLibrary="org.kaliumjni.lib" />\n$1'))
.pipe(gulp.dest(platformPath));
console.log('-----------------------------------------');
+
}
--
GitLab