Skip to content

Commit 5506356

Browse files
committed
Added build for Android Play store bundle.
1 parent a6dc085 commit 5506356

File tree

12 files changed

+1091
-277
lines changed

12 files changed

+1091
-277
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ debug/
1414
release/
1515
testresults/
1616
.eslintcache
17+
cordova/bundle.keystore
1718

1819
# OSX
1920
.DS_store

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ stages:
8686
displayName: 'Install Node.js 10.16.3'
8787
- script: yarn install
8888
displayName: 'Run yarn install'
89-
- script: yarn gulp release --android
89+
- script: yarn gulp debug-release --android
9090
displayName: 'Run yarn release for android'
9191
- task: PublishPipelineArtifact@1
9292
displayName: 'Publish Android release'

cordova/build.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

cordova/build_template.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"android": {
3+
"debug": {
4+
"keystore": "debug.keystore",
5+
"storePassword": "betaflight_debug",
6+
"alias": "betaflight_debug",
7+
"password": "password",
8+
"packageType": "apk"
9+
},
10+
"release": {
11+
"keystore": "bundle.keystore",
12+
"storePassword": "[INJECTED_BY_GULPFILE]",
13+
"alias": "betaflight",
14+
"password": "password",
15+
"packageType": "bundle"
16+
}
17+
}
18+
}

cordova/config_template.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<preference name="SplashMaintainAspectRatio" value="true"/>
3838
<preference name="SplashShowOnlyFirstTime" value="true"/>
3939
<preference name="android-minSdkVersion" value="19"/>
40+
<preference name="android-targetSdkVersion" value="30" />
4041
<config-file parent="/manifest/application/activity" target="AndroidManifest.xml">
4142
<intent-filter>
4243
<action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"/>

cordova/debug.keystore

2.4 KB
Binary file not shown.

cordova/release.keystore

-2.19 KB
Binary file not shown.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"browserify": "^17.0.0",
8484
"chai": "^4.2.0",
8585
"command-exists": "^1.2.8",
86-
"cordova-lib": "^9.0.1",
86+
"cordova-lib": "^10.0.0",
8787
"del": "^5.0.0",
8888
"eslint": "^7.16.0",
8989
"eslint-plugin-vue": "^7.3.0",
@@ -94,6 +94,7 @@
9494
"gulp-concat": "~2.6.1",
9595
"gulp-debian": "~0.1.8",
9696
"gulp-json-editor": "^2.5.4",
97+
"gulp-prompt": "^1.2.0",
9798
"gulp-rename": "^2.0.0",
9899
"gulp-replace": "^1.0.0",
99100
"gulp-xml-transformer": "^3.0.0",

src/js/backup_restore.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
function configuration_backup(callback) {
66
let activeProfile = null;
77

8-
let version = CONFIGURATOR.getConfiguratorVersion();
8+
let version = CONFIGURATOR.version;
99

1010
if (version.indexOf(".") === -1) {
1111
version = version + ".0.0";

src/js/data_storage.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,4 @@ const CONFIGURATOR = {
3434
gitRevision: 'norevision',
3535
latestVersion: '0.0.1',
3636
latestVersionReleaseUrl: 'https://github.com/betaflight/betaflight-configurator/releases',
37-
38-
getConfiguratorVersion: function () {
39-
let versionString = this.version;
40-
if (this.debugBuild) {
41-
versionString = versionString + `-debug-${this.gitChangesetId}`;
42-
}
43-
44-
return versionString;
45-
},
4637
};

0 commit comments

Comments
 (0)