Skip to content

Commit 49f5ad5

Browse files
committed
Merge branch 'development'
2 parents 2d62386 + 051e41e commit 49f5ad5

4 files changed

Lines changed: 48 additions & 2 deletions

File tree

app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ private val keystoreProperties = getKeystoreProperties()
1919

2020
val vMajor = 3
2121
val vMinor = 1
22-
val vPatch = 0
22+
val vPatch = 1
2323
val isAlpha = true
2424

2525
android {

app/src/main/res/raw/app_update_config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
[
2+
{
3+
"appVersionCode": 3010100,
4+
"type": "IMMEDIATE",
5+
"message": "Fix issue with battery percentage on wireless probes. Improved settings switch visuals. PiFire version 1.10.0 build 29+ is required",
6+
"isAlpha": true
7+
},
28
{
39
"appVersionCode": 3010000,
410
"type": "IMMEDIATE",

app/src/main/res/raw/changelog.json

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,38 @@
11
{
22
"changelog": [
33
{
4-
"version": "3.1.0",
4+
"version": "3.1.1",
55
"date": "",
66
"current": true,
77
"isAlpha": true,
8+
"logs": [
9+
{
10+
"type": "fix",
11+
"text": "Fixed a couple issues with wireless probes related to battery percentage"
12+
},
13+
{
14+
"type": "fix",
15+
"text": "Fixed an issue with crash reporting toggle in settings"
16+
},
17+
{
18+
"type": "fix",
19+
"text": "Fixed an issue with OneSignal when the device registers or re-registers with PiFire"
20+
},
21+
{
22+
"type": "imp",
23+
"text": "Updated settings screens to have improved switch preference visuals"
24+
},
25+
{
26+
"type": "imp",
27+
"text": "Update various dependencies"
28+
}
29+
]
30+
},
31+
{
32+
"version": "3.1.0",
33+
"date": "",
34+
"current": false,
35+
"isAlpha": true,
836
"logs": [
937
{
1038
"type": "new",

app/src/main/res/raw/server_support_config.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
[
2+
{
3+
"appVersionCode": 3010100,
4+
"isMandatory": true,
5+
"minServerInfo": {
6+
"version": "1.10.0",
7+
"build": "29"
8+
},
9+
"maxServerInfo": {
10+
"version": "",
11+
"build": ""
12+
}
13+
},
214
{
315
"appVersionCode": 3010000,
416
"isMandatory": true,

0 commit comments

Comments
 (0)