Added build for Android Play store bundle.

Author: mikeller

.gitignore

@@ -14,6 +14,7 @@ debug/
 release/
 testresults/
 .eslintcache
+cordova/bundle.keystore
 
 # OSX
 .DS_store

azure-pipelines.yml

@@ -86,7 +86,7 @@ stages:
       displayName: 'Install Node.js 10.16.3'
     - script: yarn install
       displayName: 'Run yarn install'
-    - script: yarn gulp release --android
+    - script: yarn gulp debug-release --android
       displayName: 'Run yarn release for android'
     - task: PublishPipelineArtifact@1
       displayName: 'Publish Android release'

cordova/build.json

@@ -0,0 +1,18 @@
+{
+    "android": {
+        "debug": {
+            "keystore": "debug.keystore",
+            "storePassword": "betaflight_debug",
+            "alias": "betaflight_debug",
+            "password": "password",
+            "packageType": "apk"
+        },
+        "release": {
+            "keystore": "bundle.keystore",
+            "storePassword": "[INJECTED_BY_GULPFILE]",
+            "alias": "betaflight",
+            "password": "password",
+            "packageType": "bundle"
+        }
+    }
+}

cordova/build_template.json

@@ -37,6 +37,7 @@
         <preference name="SplashMaintainAspectRatio" value="true"/>
         <preference name="SplashShowOnlyFirstTime" value="true"/>
         <preference name="android-minSdkVersion" value="19"/>
+        <preference name="android-targetSdkVersion" value="30" />
         <config-file parent="/manifest/application/activity" target="AndroidManifest.xml">
             <intent-filter>
                 <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"/>

cordova/config_template.xml

@@ -104,9 +104,9 @@ function processPackageDebug(done) {
 
 // dist_yarn MUST be done after dist_src
 
-const distBuild = gulp.series(processPackageRelease, dist_src, dist_changelog, dist_yarn, dist_locale, dist_libraries, dist_resources, dist_rollup, gulp.series(cordova_dist(true)));
+const distBuild = gulp.series(processPackageRelease, dist_src, dist_changelog, dist_yarn, dist_locale, dist_libraries, dist_resources, dist_rollup, gulp.series(cordova_dist()));
 
-const debugDistBuild = gulp.series(processPackageDebug, dist_src, dist_changelog, dist_yarn, dist_locale, dist_libraries, dist_resources, dist_rollup, gulp.series(cordova_dist(false)));
+const debugDistBuild = gulp.series(processPackageDebug, dist_src, dist_changelog, dist_yarn, dist_locale, dist_libraries, dist_resources, dist_rollup, gulp.series(cordova_dist()));
 
 const distRebuild = gulp.series(clean_dist, distBuild);
 gulp.task('dist', distRebuild);
@@ -293,21 +293,48 @@ function processPackage(done, gitRevision, isReleaseBuild) {
         metadata.packageId = pkg.name;
     }
 
-    const packageJson = new stream.Readable;
-    packageJson.push(JSON.stringify(pkg, undefined, 2));
-    packageJson.push(null);
+    function version_prompt() {
+        return gulp.src('.')
+            .pipe(prompt.prompt([{
+                type: 'input',
+                name: 'version',
+                message: `Bundle version (default: ${pkg.version}):`,
+            }, {
+                type: 'input',
+                name: 'storeVersion',
+                message: 'Google Play store version (<x.y.z>, default: package version):',
+            }], function(res) {
+                if (res.version) {
+                    pkg.version = res.version;
+                }
+                if (res.storeVersion) {
+                    metadata.storeVersion = res.storeVersion;
+                }
+            }));
+    };
 
-    Object.keys(pkg)
-        .filter(key => metadataKeys.includes(key))
-        .forEach((key) => {
-            metadata[key] = pkg[key];
-        });
+    function write_package_file() {
+        Object.keys(pkg)
+            .filter(key => metadataKeys.includes(key))
+            .forEach((key) => {
+                metadata[key] = pkg[key];
+            });
 
-    packageJson
-        .pipe(source('package.json'))
-        .pipe(gulp.dest(DIST_DIR));
+        const packageJson = new stream.Readable;
+        packageJson.push(JSON.stringify(pkg, undefined, 2));
+        packageJson.push(null);
 
-    done();
+        return packageJson
+            .pipe(source('package.json'))
+            .pipe(gulp.dest(DIST_DIR));
+    };
+
+    const platforms = getPlatforms();
+    if (platforms.indexOf('android') !== -1 && isReleaseBuild) {
+        gulp.series(version_prompt, write_package_file)(done);
+    } else {
+        gulp.series(write_package_file)(done);
+    }
 }
 
 function dist_src() {
@@ -466,7 +493,7 @@ function debug(done) {
     buildNWAppsWrapper(platforms, 'sdk', DEBUG_DIR, done);
 }
 
-function injectARMCache(flavor, callback) {
+function injectARMCache(flavor, done) {
     const flavorPostfix = `-${flavor}`;
     const flavorDownloadPostfix = flavor !== 'normal' ? `-${flavor}` : '';
     clean_cache().then(function() {
@@ -529,7 +556,7 @@ function injectARMCache(flavor, callback) {
                             clean_debug();
                             process.exit(1);
                         }
-                        callback();
+                        done();
                     }
                 );
             }
@@ -593,10 +620,10 @@ function buildNWApps(platforms, flavor, dir, done) {
 
 function getGitRevision(done, callback, isReleaseBuild) {
     let gitRevision = 'norevision';
-    git.diff([ '--shortstat' ], function (err, diff) {
-        if (!err && !diff) {
-            git.log([ '-1', '--pretty=format:%h' ], function (err, rev) {
-                if (!err) {
+    git.diff([ '--shortstat' ], function (err1, diff) {
+        if (!err1 && !diff) {
+            git.log([ '-1', '--pretty=format:%h' ], function (err2, rev) {
+                if (!err2) {
                     gitRevision = rev.latest.hash;
                 }
 
@@ -881,7 +908,7 @@ function listReleaseTasks(isReleaseBuild, appDirectory) {
 }
 
 // Cordova
-function cordova_dist(isReleaseBuild) {
+function cordova_dist() {
     const distTasks = [];
     const platforms = getPlatforms();
     if (platforms.indexOf('android') !== -1) {
@@ -893,11 +920,7 @@ function cordova_dist(isReleaseBuild) {
         distTasks.push(cordova_rename_src_config);
         distTasks.push(cordova_rename_src_package);
         distTasks.push(cordova_packagejson);
-        if (isReleaseBuild) {
-            distTasks.push(cordova_configxml);
-        } else {
-            distTasks.push(cordova_debug_configxml);
-        }
+        distTasks.push(cordova_configxml);
         distTasks.push(cordova_rename_build_json);
         distTasks.push(cordova_browserify);
         distTasks.push(cordova_depedencies);
@@ -989,8 +1012,8 @@ function cordova_packagejson() {
         .pipe(gulp.dest(CORDOVA_DIST_DIR));
 }
 
-function cordova_configxml_internal() {
-    let androidName = metadata.packageId.replace(NAME_REGEX, '_');
+function cordova_configxml() {
+    const androidName = metadata.packageId.replace(NAME_REGEX, '_');
 
     return gulp.src([`${CORDOVA_DIST_DIR}config.xml`])
         .pipe(xmlTransformer([
@@ -1000,37 +1023,18 @@ function cordova_configxml_internal() {
         ], 'http://www.w3.org/ns/widgets'))
         .pipe(xmlTransformer([
             { path: '.', attr: { 'id': `com.betaflight.${androidName}` } },
-            { path: '.', attr: { 'version': metadata.version } },
+            { path: '.', attr: { 'version': metadata.storeVersion ? metadata.storeVersion : metadata.version } },
         ]))
         .pipe(gulp.dest(CORDOVA_DIST_DIR));
 }
 
-function cordova_debug_configxml() {
-    return cordova_configxml_internal();
-}
-
-function cordova_configxml(callback) {
-    return gulp.series(function version_prompt() {
-        return gulp.src('.')
-            .pipe(prompt.prompt({
-                type: 'input',
-                name: 'version',
-                message: `Bundle version (default: ${metadata.version}):`,
-            }, function(res) {
-                if (res.version) {
-                    metadata.version = res.version;
-                }
-            }));
-    }, cordova_configxml_internal)(callback);
-}
-
 function cordova_rename_build_json() {
     return gulp.src(`${CORDOVA_DIR}build_template.json`)
         .pipe(rename('build.json'))
         .pipe(gulp.dest(CORDOVA_DIST_DIR));
 }
 
-function cordova_browserify(callback) {
+function cordova_browserify(done) {
     const readFile = function(file) {
         return new Promise(function(resolve) {
             if (!file.includes("node_modules")) {
@@ -1048,7 +1052,7 @@ function cordova_browserify(callback) {
     glob(`${CORDOVA_DIST_DIR}www/**/*.js`, {}, function (err, files) {
         const readLoop = function() {
             if (files.length === 0) {
-                callback();
+                done();
             } else {
                 const file = files.pop();
                 readFile(file).then(function() {
@@ -1087,7 +1091,7 @@ function cordova_debug() {
     cordova.run();
 }
 
-function cordova_debug_build(cb) {
+function cordova_debug_build(done) {
     cordova.build({
         'platforms': ['android'],
         'options': {
@@ -1096,13 +1100,14 @@ function cordova_debug_build(cb) {
         },
     }).then(function() {
         process.chdir('../');
-        cb();
-    });
 
-    console.log('APK will be generated at dist_cordova/platforms/android/app/build/outputs/apk/release/app-release.apk');
+        console.log('APK has been generated at dist_cordova/platforms/android/app/build/outputs/apk/release/app-release.apk');
+
+        done();
+    });
 }
 
-function cordova_build(callback) {
+function cordova_build(done) {
     let storePassword = '';
     return gulp.series(function password_prompt() {
         return gulp.src('.')
@@ -1119,11 +1124,11 @@ function cordova_build(callback) {
                 'android': {
                     'release' : {
                         'storePassword': storePassword,
-                    }
-                }
+                    },
+                },
             }))
             .pipe(gulp.dest('./'));
-    }, function build(cb) {
+    }, function build(done) {
         return cordova.build({
             'platforms': ['android'],
             'options': {
@@ -1134,24 +1139,28 @@ function cordova_build(callback) {
             // Delete the file containing the store password
             del(['build.json'], { force: true });
             process.chdir('../');
-            cb();
-        });
-    })(callback);
 
-    console.log('AAB will be generated at dist_cordova/platforms/android/app/build/outputs/bundle/release/app.aab');
+            console.log('AAB has been generated at dist_cordova/platforms/android/app/build/outputs/bundle/release/app.aab');
+            done();
+        });
+    })(done);
 }
 
 async function cordova_debug_release() {
-    const filename = await getReleaseFilename('android', 'apk');
+    const filename = getReleaseFilename('android', 'apk');
+
     console.log(`Release APK : release/${filename}`);
+
     return gulp.src(`${CORDOVA_DIST_DIR}platforms/android/app/build/outputs/apk/debug/app-debug.apk`)
         .pipe(rename(filename))
         .pipe(gulp.dest(RELEASE_DIR));
 }
 
 async function cordova_release() {
-    const filename = await getReleaseFilename('android', 'aab');
+    const filename = getReleaseFilename('android', 'aab');
+
     console.log(`Release AAB : release/${filename}`);
+
     return gulp.src(`${CORDOVA_DIST_DIR}platforms/android/app/build/outputs/bundle/release/app.aab`)
         .pipe(rename(filename))
         .pipe(gulp.dest(RELEASE_DIR));

cordova/debug.keystore

@@ -83,7 +83,7 @@
     "browserify": "^17.0.0",
     "chai": "^4.2.0",
     "command-exists": "^1.2.8",
-    "cordova-lib": "^9.0.1",
+    "cordova-lib": "^10.0.0",
     "del": "^5.0.0",
     "eslint": "^7.16.0",
     "eslint-plugin-vue": "^7.3.0",
@@ -94,6 +94,7 @@
     "gulp-concat": "~2.6.1",
     "gulp-debian": "~0.1.8",
     "gulp-json-editor": "^2.5.4",
+    "gulp-prompt": "^1.2.0",
     "gulp-rename": "^2.0.0",
     "gulp-replace": "^1.0.0",
     "gulp-xml-transformer": "^3.0.0",

cordova/release.keystore

@@ -5,7 +5,7 @@
 function configuration_backup(callback) {
     let activeProfile = null;
 
-    let version = CONFIGURATOR.getConfiguratorVersion();
+    let version = CONFIGURATOR.version;
 
     if (version.indexOf(".") === -1) {
         version = version + ".0.0";