Skip to content

Commit 1b7bc5b

Browse files
committed
📝 change default AndroidManifest path to support android 7 and higher
1 parent 600efc5 commit 1b7bc5b

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def doExtractStringFromManifest(name) {
1111
android {
1212
sourceSets {
1313
main {
14-
manifest.srcFile 'AndroidManifest.xml'
14+
manifest.srcFile 'src/main/AndroidManifest.xml'
1515
}
1616
}
1717

scripts/android/before_plugin_install.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,20 @@ const getAndroidVersion = () => {
3636
}
3737
};
3838

39-
const isAndroid7 = version => {
39+
const isLessThanAndroid7 = version => {
4040
if (version) {
4141
const major = parseInt(version.split('.')[0]);
42-
return major >= 7;
42+
return major < 7;
4343
}
4444
};
4545

4646
module.exports = function(ctx) {
4747
if (ibgBuildGradleExists) {
4848
let buildGradle = readIbgBuildGradle();
49-
if (isAndroid7(getAndroidVersion())) {
49+
if (isLessThanAndroid7(getAndroidVersion())) {
5050
buildGradle = buildGradle.replace(
51-
"manifest.srcFile 'AndroidManifest.xml'",
52-
"manifest.srcFile 'src/main/AndroidManifest.xml'"
51+
"manifest.srcFile 'src/main/AndroidManifest.xml'",
52+
"manifest.srcFile 'AndroidManifest.xml'"
5353
);
5454
writeIbgBuildGradle(buildGradle);
5555
}

0 commit comments

Comments
 (0)