Skip to content

Commit

Permalink
Merge branch 'release/v6.6.2' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
graphefruit committed Sep 14, 2023
2 parents fd8607c + e54ce3a commit 917b0cb
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 25 deletions.
12 changes: 12 additions & 0 deletions config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,18 @@
</dict>
</array>
</edit-config>
<edit-file file="*-Info.plist" mode="merge" target="NSHealthShareUsageDescription">
<string>App needs access to Health to read, write and update the amount of caffeine by each coffee brew, which was recorded with this app.</string>
</edit-file>
<edit-file file="*-Info.plist" mode="merge" target="NSHealthUpdateUsageDescription">
<string>App needs access to Health to read, write and update the amount of caffeine by each coffee brew, which was recorded with this app.</string>
</edit-file>
<edit-file file="*-Info.plist" mode="merge" target="NSBluetoothPeripheralUsageDescription">
<string>Blutooth access needed to connect smartscales, pressure devices, thermo devices or refractometer. With this these data to each coffee brew can be logged.</string>
</edit-file>
<edit-file file="*-Info.plist" mode="merge" target="NSBluetoothAlwaysUsageDescription">
<string>Blutooth access needed to connect smartscales, pressure devices, thermo devices or refractometer. With this these data to each coffee brew can be logged.</string>
</edit-file>
<edit-file file="*-Info.plist" mode="merge" target="NSHealthShareUsageDescription">
<string>App needs read access to see the caffeinate amount which was tracked with this coffee app</string>
</edit-file>
Expand Down
19 changes: 0 additions & 19 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 1 addition & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@
"cordova-plugin-splashscreen": "^6.0.1",
"cordova-plugin-x-socialsharing": "^6.0.4",
"cordova-sqlite-storage": "^5.1.0",
"cordova.plugins.diagnostic": "^7.1.2",
"elliptic": ">=6.5.4",
"es6-promise-plugin": "^4.2.2",
"husky": "^8.0.1",
Expand Down Expand Up @@ -207,10 +206,6 @@
"cordova-plugin-file": {
"ANDROIDX_WEBKIT_VERSION": "1.4.0"
},
"cordova.plugins.diagnostic": {
"ANDROIDX_VERSION": "1.0.0",
"ANDROIDX_APPCOMPAT_VERSION": "1.3.1"
},
"cordova-android-support-gradle-release": {
"ANDROID_SUPPORT_VERSION": "27.+"
},
Expand Down Expand Up @@ -258,4 +253,4 @@
"*.css": "stylelint --fix",
"*.{ts,js,css,md}": "prettier --write"
}
}
}

0 comments on commit 917b0cb

Please sign in to comment.