Skip to content

Commit 9b68a6e

Browse files
committed
Chore: Resolve lint errors for backup rules and dependencies
This commit configures backup rules for the Android application by adding `fullBackupContent` and `dataExtractionRules` attributes to the `application` tag in the `AndroidManifest.xml`. It also includes the corresponding XML files (`full_backup_content.xml` and `data_extraction_rules.xml`) to specify the backup behavior. Additionally, the following dependency versions have been updated in `gradle/libs.versions.toml`: - androidx-room to 2.7.0 - androidx-lifecycle to 2.9.0-beta01 - compose-material3 to 1.3.2 - sqlite to 2.5.0
1 parent a6dfb44 commit 9b68a6e

5 files changed

Lines changed: 69 additions & 9 deletions

File tree

Fruitties/androidApp/src/main/AndroidManifest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<uses-permission android:name="android.permission.INTERNET" />
1919
<application
2020
android:allowBackup="false"
21+
android:fullBackupContent="@xml/full_backup_content"
22+
android:dataExtractionRules="@xml/data_extraction_rules"
2123
android:supportsRtl="true"
2224
android:theme="@style/AppTheme"
2325
android:name=".di.App">

Fruitties/androidApp/src/main/res/values/strings.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,5 @@
1616
-->
1717
<resources>
1818
<string name="frutties">"Frutties"</string>
19-
<string name="save">Save</string>
2019
<string name="add">Add</string>
21-
<string name="loading">Loading</string>
22-
<string name="retry">Retry</string>
2320
</resources>
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright 2025 The Android Open Source Project
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<data-extraction-rules>
18+
<cloud-backup>
19+
<exclude domain="file" />
20+
<exclude domain="database" />
21+
<exclude domain="sharedpref" />
22+
<exclude domain="external" />
23+
<exclude domain="root" />
24+
<exclude domain="device_file" />
25+
<exclude domain="device_database" />
26+
<exclude domain="device_sharedpref" />
27+
<exclude domain="device_root" />
28+
</cloud-backup>
29+
<device-transfer>
30+
<exclude domain="file" />
31+
<exclude domain="database" />
32+
<exclude domain="sharedpref" />
33+
<exclude domain="external" />
34+
<exclude domain="root" />
35+
<exclude domain="device_file" />
36+
<exclude domain="device_database" />
37+
<exclude domain="device_sharedpref" />
38+
<exclude domain="device_root" />
39+
</device-transfer>
40+
</data-extraction-rules>
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright 2025 The Android Open Source Project
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<full-backup-content>
18+
<exclude domain="root" />
19+
<exclude domain="file" />
20+
<exclude domain="database" />
21+
<exclude domain="sharedpref" />
22+
<exclude domain="external" />
23+
</full-backup-content>

Fruitties/gradle/libs.versions.toml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
agp = "8.9.1"
1717
androidx-activityCompose = "1.10.1"
1818
androidx-paging = "3.3.6"
19-
androidx-room = "2.7.0-rc03"
20-
androidx-lifecycle = "2.9.0-alpha13"
19+
androidx-room = "2.7.0"
20+
androidx-lifecycle = "2.9.0-beta01"
2121
atomicfu = "0.27.0"
2222
compose = "1.7.8"
23-
compose-material3 = "1.3.1"
23+
compose-material3 = "1.3.2"
2424
dataStore = "1.1.4"
2525
kotlin = "2.1.10"
2626
kotlinx-coroutines = "1.10.1"
@@ -29,7 +29,7 @@ ksp = "2.1.10-1.0.30"
2929
ktorVersion = "3.0.3"
3030
pagingComposeAndroid = "3.3.6"
3131
skie = "0.10.1"
32-
sqlite = "2.5.0-rc03"
32+
sqlite = "2.5.0"
3333
spotless = "7.0.2"
3434
okio = "3.10.2"
3535
runner = "1.6.2"
@@ -54,8 +54,6 @@ compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview"
5454
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
5555
kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "atomicfu" }
5656
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
57-
kotlinx-coroutines-core-iosarm64 = { module = "org.jetbrains.kotlinx:kotlinx-kotlinx-coroutines-core-iosarm64", version.ref = "kotlinx-coroutines" }
58-
kotlinx-coroutines-core-iossimulatorarm64 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core-iossimulatorarm64", version.ref = "kotlinx-coroutines" }
5957
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
6058
ktor-client-android = { module = "io.ktor:ktor-client-android", version.ref = "ktorVersion" }
6159
ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktorVersion" }

0 commit comments

Comments
 (0)