Skip to content

Commit b8016de

Browse files
committed
build: fix android version bump script
1 parent 84345cc commit b8016de

File tree

4 files changed

+38
-8
lines changed

4 files changed

+38
-8
lines changed

android/app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ android {
2020
minSdkVersion 24
2121
targetSdkVersion 34
2222
compileSdk 34
23-
versionCode 110003_00_02_0000
23+
versionCode 11_00_03_0000
2424
versionName "11.0.3"
2525
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
2626
manifestPlaceholders = [

fastlane/metadata/android/en-US/changelogs/110003.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
* **android:** formatting
1414
* **issueProvider:** remove jira pat and wonkyCookie modes #2528
1515
* move monday-friday setting up
16-
* use 12-hour format for schedule times #3676
16+
* use 12-hour format for schedule times #3676
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
### Bug Fixes
2+
3+
- **android:** android file sync not working #3782
4+
- issue panel being opened on start
5+
- **issueProvider:** crash on task done and related #3779
6+
### Features
7+
8+
- adjust locale to browser locale on app start #3676
9+
- also display am and pm for planner task badge #3676
10+
- also display am and pm for task time badge #3676
11+
- also localize schedule better #3676
12+
- **android:** formatting
13+
- **issueProvider:** remove jira pat and wonkyCookie modes #2528
14+
- move monday-friday setting up
15+
- use 12-hour format for schedule times #3676

tools/bump-android-version.js

+21-6
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,36 @@ const path = require('path');
55
const packageJson = require('../package.json');
66
const version = packageJson.version;
77

8+
if (version.includes('-' || version.includes('rc'))) {
9+
console.log('Version contains - or rc – skipping android version bump');
10+
return;
11+
}
12+
13+
String.prototype.insertAt = function (index, string) {
14+
return this.substr(0, index) + string + this.substr(index);
15+
};
16+
817
// Define the path to build.gradle
918
const gradleFilePath = path.join(__dirname, '..', 'android', 'app', 'build.gradle');
1019

1120
// Read the build.gradle file
1221
let gradleFileContent = fs.readFileSync(gradleFilePath, 'utf8');
1322

1423
// Update the versionCode and versionName
15-
const versionCodeDroid = version
16-
.split('.')
17-
.map((num) => num.padStart(2, '0'))
18-
.join('');
24+
const versionCodeDroid =
25+
version
26+
.split('.')
27+
.map((num) => num.padStart(2, '0'))
28+
.join('') * 10000;
29+
const versionCodeDroidWithUnderscores = versionCodeDroid
30+
.toString()
31+
.insertAt(6, '_')
32+
.insertAt(4, '_')
33+
.insertAt(2, '_');
1934

2035
gradleFileContent = gradleFileContent.replace(
21-
/versionCode \d+/g,
22-
`versionCode ${versionCodeDroid}`,
36+
/versionCode (\d|_)+/g,
37+
`versionCode ${versionCodeDroidWithUnderscores}`,
2338
);
2439
gradleFileContent = gradleFileContent.replace(
2540
/versionName "[^"]+"/g,

0 commit comments

Comments
 (0)