Skip to content

Commit a359a2c

Browse files
committed
style: restore the mixed line endings f136f95 rewrote
The editor normalized gradle/libs.versions.toml and WorkerScheduleTest.kt to CRLF throughout while adding one catalog entry and one test, so the commit rewrote 120 unrelated lines. Both files go back to their previous bytes plus those two additions; the net change from before f136f95 is the nine intended lines.
1 parent f136f95 commit a359a2c

2 files changed

Lines changed: 59 additions & 59 deletions

File tree

‎app/src/test/java/com/sysadmindoc/callshield/service/WorkerScheduleTest.kt‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -53,42 +53,42 @@ class WorkerScheduleTest {
5353
}
5454

5555
@Test
56-
fun pendingBlockedCallLogRequestDoesNotRequireNetworkAndRetries() {
56+
fun pendingBlockedCallLogRequestDoesNotRequireNetworkAndRetries() {
5757
val spec = PendingBlockedCallLogWorker.pendingRequest().workSpec
5858

5959
assertEquals(NetworkType.NOT_REQUIRED, spec.constraints.requiredNetworkType)
6060
assertEquals(BackoffPolicy.EXPONENTIAL, spec.backoffPolicy)
61-
assertEquals(TimeUnit.MINUTES.toMillis(1), spec.backoffDelayDuration)
62-
}
63-
64-
@Test
65-
fun protectionHealthUsesDailyChecksAndAnImmediateRecoveryRequest() {
66-
val periodic = ProtectionHealthWorker.periodicRequest().workSpec
67-
val immediate = ProtectionHealthWorker.immediateRequest().workSpec
68-
69-
assertEquals(TimeUnit.HOURS.toMillis(24), periodic.intervalDuration)
70-
assertEquals(TimeUnit.HOURS.toMillis(24), periodic.initialDelay)
71-
assertEquals(NetworkType.NOT_REQUIRED, periodic.constraints.requiredNetworkType)
72-
assertEquals(0L, immediate.initialDelay)
73-
assertEquals(NetworkType.NOT_REQUIRED, immediate.constraints.requiredNetworkType)
74-
}
75-
76-
@Test
77-
fun appUpdateUsesWeeklyConnectedChecksAndExponentialBackoff() {
78-
val spec = AppUpdateWorker.periodicRequest().workSpec
79-
80-
assertEquals(TimeUnit.DAYS.toMillis(7), spec.intervalDuration)
81-
assertEquals(TimeUnit.DAYS.toMillis(7), spec.initialDelay)
82-
assertEquals(NetworkType.CONNECTED, spec.constraints.requiredNetworkType)
83-
assertEquals(BackoffPolicy.EXPONENTIAL, spec.backoffPolicy)
84-
assertEquals(TimeUnit.MINUTES.toMillis(30), spec.backoffDelayDuration)
85-
}
86-
87-
@Test
88-
fun manualAppUpdateCheckRequiresNetwork() {
89-
val spec = AppUpdateWorker.immediateRequest().workSpec
90-
91-
assertEquals(NetworkType.CONNECTED, spec.constraints.requiredNetworkType)
92-
assertEquals(0L, spec.initialDelay)
93-
}
94-
}
61+
assertEquals(TimeUnit.MINUTES.toMillis(1), spec.backoffDelayDuration)
62+
}
63+
64+
@Test
65+
fun protectionHealthUsesDailyChecksAndAnImmediateRecoveryRequest() {
66+
val periodic = ProtectionHealthWorker.periodicRequest().workSpec
67+
val immediate = ProtectionHealthWorker.immediateRequest().workSpec
68+
69+
assertEquals(TimeUnit.HOURS.toMillis(24), periodic.intervalDuration)
70+
assertEquals(TimeUnit.HOURS.toMillis(24), periodic.initialDelay)
71+
assertEquals(NetworkType.NOT_REQUIRED, periodic.constraints.requiredNetworkType)
72+
assertEquals(0L, immediate.initialDelay)
73+
assertEquals(NetworkType.NOT_REQUIRED, immediate.constraints.requiredNetworkType)
74+
}
75+
76+
@Test
77+
fun appUpdateUsesWeeklyConnectedChecksAndExponentialBackoff() {
78+
val spec = AppUpdateWorker.periodicRequest().workSpec
79+
80+
assertEquals(TimeUnit.DAYS.toMillis(7), spec.intervalDuration)
81+
assertEquals(TimeUnit.DAYS.toMillis(7), spec.initialDelay)
82+
assertEquals(NetworkType.CONNECTED, spec.constraints.requiredNetworkType)
83+
assertEquals(BackoffPolicy.EXPONENTIAL, spec.backoffPolicy)
84+
assertEquals(TimeUnit.MINUTES.toMillis(30), spec.backoffDelayDuration)
85+
}
86+
87+
@Test
88+
fun manualAppUpdateCheckRequiresNetwork() {
89+
val spec = AppUpdateWorker.immediateRequest().workSpec
90+
91+
assertEquals(NetworkType.CONNECTED, spec.constraints.requiredNetworkType)
92+
assertEquals(0L, spec.initialDelay)
93+
}
94+
}

‎gradle/libs.versions.toml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
[versions]
2-
agp = "8.13.2"
3-
kotlin = "2.3.21"
4-
ksp = "2.3.11"
5-
kover = "0.9.9"
2+
agp = "8.13.2"
3+
kotlin = "2.3.21"
4+
ksp = "2.3.11"
5+
kover = "0.9.9"
66
ktlintGradle = "14.2.0"
77
ktlintCli = "1.8.0"
88
detekt = "1.23.8"
9-
hilt = "2.58"
10-
androidxHilt = "1.3.0"
11-
kotlinxSerialization = "1.11.0"
12-
coreKtx = "1.18.0"
13-
lifecycleRuntime = "2.10.0"
14-
activityCompose = "1.13.0"
15-
appcompat = "1.7.1"
16-
composeBom = "2026.06.01"
17-
room = "2.8.4"
18-
paging = "3.4.2"
19-
navigation = "2.9.8"
9+
hilt = "2.58"
10+
androidxHilt = "1.3.0"
11+
kotlinxSerialization = "1.11.0"
12+
coreKtx = "1.18.0"
13+
lifecycleRuntime = "2.10.0"
14+
activityCompose = "1.13.0"
15+
appcompat = "1.7.1"
16+
composeBom = "2026.06.01"
17+
room = "2.8.4"
18+
paging = "3.4.2"
19+
navigation = "2.9.8"
2020
datastore = "1.2.1"
2121
work = "2.11.2"
2222
okhttp = "5.4.0"
@@ -26,15 +26,15 @@ androidxTestExt = "1.3.0"
2626
androidxTestRunner = "1.7.0"
2727
androidxTestCore = "1.7.0"
2828
espresso = "3.7.0"
29-
robolectric = "4.16.1"
29+
robolectric = "4.16.1"
3030

3131
[libraries]
3232
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
3333
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntime" }
3434
androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycleRuntime" }
3535
androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycleRuntime" }
36-
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
37-
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
36+
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
37+
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
3838
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
3939
androidx-ui = { group = "androidx.compose.ui", name = "ui" }
4040
androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
@@ -46,9 +46,9 @@ androidx-navigation-compose = { group = "androidx.navigation", name = "navigatio
4646
androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
4747
androidx-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
4848
androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
49-
androidx-room-testing = { group = "androidx.room", name = "room-testing", version.ref = "room" }
50-
androidx-room-paging = { group = "androidx.room", name = "room-paging", version.ref = "room" }
51-
androidx-paging-compose = { group = "androidx.paging", name = "paging-compose", version.ref = "paging" }
49+
androidx-room-testing = { group = "androidx.room", name = "room-testing", version.ref = "room" }
50+
androidx-room-paging = { group = "androidx.room", name = "room-paging", version.ref = "room" }
51+
androidx-paging-compose = { group = "androidx.paging", name = "paging-compose", version.ref = "paging" }
5252
androidx-datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "datastore" }
5353
androidx-work-runtime-ktx = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "work" }
5454
androidx-work-testing = { group = "androidx.work", name = "work-testing", version.ref = "work" }
@@ -68,9 +68,9 @@ androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version
6868
androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTestRunner" }
6969
androidx-test-core = { group = "androidx.test", name = "core", version.ref = "androidxTestCore" }
7070
androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" }
71-
androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
72-
androidx-compose-ui-test-junit4-accessibility = { group = "androidx.compose.ui", name = "ui-test-junit4-accessibility" }
73-
androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
71+
androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
72+
androidx-compose-ui-test-junit4-accessibility = { group = "androidx.compose.ui", name = "ui-test-junit4-accessibility" }
73+
androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
7474

7575
[plugins]
7676
android-application = { id = "com.android.application", version.ref = "agp" }

0 commit comments

Comments
 (0)