Skip to content

Commit 007e543

Browse files
Merge pull request #2468 from HedvigInsurance/renovate/all
Update all dependencies
2 parents 2a4b8f1 + a93227a commit 007e543

File tree

9 files changed

+73
-74
lines changed

9 files changed

+73
-74
lines changed

.github/workflows/pr.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
LOKALISE_ID: ${{ secrets.LOKALISE_ID }}
2424
LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
2525
- name: Setup JDK 17
26-
uses: actions/setup-java@v4.7.0
26+
uses: actions/setup-java@v4.7.1
2727
with:
2828
java-version: '21'
2929
distribution: 'zulu'
@@ -53,7 +53,7 @@ jobs:
5353
LOKALISE_ID: ${{ secrets.LOKALISE_ID }}
5454
LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
5555
- name: Setup JDK 17
56-
uses: actions/setup-java@v4.7.0
56+
uses: actions/setup-java@v4.7.1
5757
with:
5858
java-version: '21'
5959
distribution: 'zulu'
@@ -63,7 +63,7 @@ jobs:
6363
# Only write to the cache for builds on the 'develop' branch
6464
cache-read-only: false
6565
- run: ./gradlew lint
66-
- uses: yutailang0119/action-android-lint@v4.0.0
66+
- uses: yutailang0119/action-android-lint@v5.0.0
6767
with:
6868
report-path: app/build/reports/lint-results-debug.xml
6969
continue-on-error: true
@@ -83,7 +83,7 @@ jobs:
8383
LOKALISE_ID: ${{ secrets.LOKALISE_ID }}
8484
LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
8585
- name: Setup JDK 17
86-
uses: actions/setup-java@v4.7.0
86+
uses: actions/setup-java@v4.7.1
8787
with:
8888
java-version: '21'
8989
distribution: 'zulu'
@@ -97,7 +97,7 @@ jobs:
9797
run: ./gradlew ktlintCheck
9898
- name: Annotate ktlint errors in the PR
9999
continue-on-error: false
100-
uses: yutailang0119/action-ktlint@v4
100+
uses: yutailang0119/action-ktlint@v5
101101
with:
102102
report-path: build/reports/ktlint/*.xml
103103
build:
@@ -116,7 +116,7 @@ jobs:
116116
LOKALISE_ID: ${{ secrets.LOKALISE_ID }}
117117
LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
118118
- name: Setup JDK 17
119-
uses: actions/setup-java@v4.7.0
119+
uses: actions/setup-java@v4.7.1
120120
with:
121121
java-version: '21'
122122
distribution: 'zulu'

.github/workflows/staging.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
LOKALISE_ID: ${{ secrets.LOKALISE_ID }}
2727
LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
2828
- name: Setup JDK 17
29-
uses: actions/setup-java@v4.7.0
29+
uses: actions/setup-java@v4.7.1
3030
with:
3131
java-version: '21'
3232
distribution: 'zulu'
@@ -62,7 +62,7 @@ jobs:
6262
keyPassword: ${{ secrets.KEY_PASSWORD }}
6363
env:
6464
BUILD_TOOLS_VERSION: ${{ env.BUILD_TOOL_VERSION }}
65-
- uses: wzieba/Firebase-Distribution-Github-Action@v1.7.0
65+
- uses: wzieba/Firebase-Distribution-Github-Action@v1.7.1
6666
with:
6767
serviceCredentialsFileContent: ${{ secrets.FIREBASE_CREDENTIALS_FILE_CONTENT }}
6868
appId: ${{ secrets.FIREBASE_STAGING_APP_ID_PACKAGE_COM_HEDVIG_APP }}

.github/workflows/unused-resources.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
2323

2424
- name: Setup JDK 17
25-
uses: actions/setup-java@v4.7.0
25+
uses: actions/setup-java@v4.7.1
2626
with:
2727
java-version: '21'
2828
distribution: 'zulu'

.github/workflows/upload-to-play-store.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
LOKALISE_ID: ${{ secrets.LOKALISE_ID }}
2727
LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
2828
- name: Setup JDK 17
29-
uses: actions/setup-java@v4.7.0
29+
uses: actions/setup-java@v4.7.1
3030
with:
3131
java-version: '21'
3232
distribution: 'zulu'
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
3-
4-
</manifest>
2+
<manifest />

app/feature/feature-travel-certificate/src/test/kotlin/com/hedvig/android/feature/travelcertificate/GetTravelCertificateSpecificationsUseCaseTest.kt

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ import com.hedvig.android.apollo.octopus.test.OctopusFakeResolver
1313
import com.hedvig.android.apollo.test.TestApolloClientRule
1414
import com.hedvig.android.core.common.test.isLeft
1515
import com.hedvig.android.core.common.test.isRight
16+
import com.hedvig.android.feature.travelcertificate.data.GetTravelCertificateSpecificationsUseCaseImpl
17+
import com.hedvig.android.feature.travelcertificate.data.TravelCertificateData
18+
import com.hedvig.android.feature.travelcertificate.data.TravelCertificateError
1619
import com.hedvig.android.logger.TestLogcatLoggingRule
1720
import kotlinx.coroutines.test.runTest
1821
import kotlinx.datetime.LocalDate
@@ -39,7 +42,7 @@ internal class GetTravelCertificateSpecificationsUseCaseTest {
3942
@Test
4043
fun `when the feature flag is on and the network request fails, we get not Error response`() = runTest {
4144
val travelCertificateUseCase =
42-
com.hedvig.android.feature.travelcertificate.data.GetTravelCertificateSpecificationsUseCaseImpl(
45+
GetTravelCertificateSpecificationsUseCaseImpl(
4346
apolloClient,
4447
)
4548

@@ -48,14 +51,14 @@ internal class GetTravelCertificateSpecificationsUseCaseTest {
4851

4952
assertThat(
5053
result,
51-
).isLeft().isInstanceOf<com.hedvig.android.feature.travelcertificate.data.TravelCertificateError.Error>()
54+
).isLeft().isInstanceOf<TravelCertificateError.Error>()
5255
}
5356

5457
@Test
5558
fun `when the feature flag is on and the network response contains no travel certificate, we get not eligible`() =
5659
runTest {
5760
val travelCertificateUseCase =
58-
com.hedvig.android.feature.travelcertificate.data.GetTravelCertificateSpecificationsUseCaseImpl(
61+
GetTravelCertificateSpecificationsUseCaseImpl(
5962
apolloClient,
6063
)
6164

@@ -67,13 +70,13 @@ internal class GetTravelCertificateSpecificationsUseCaseTest {
6770

6871
assertThat(
6972
result,
70-
).isLeft().isInstanceOf<com.hedvig.android.feature.travelcertificate.data.TravelCertificateError.NotEligible>()
73+
).isLeft().isInstanceOf<TravelCertificateError.NotEligible>()
7174
}
7275

7376
@Test
7477
fun `when the passed contractId is wrong, we get not eligible`() = runTest {
7578
val travelCertificateUseCase =
76-
com.hedvig.android.feature.travelcertificate.data.GetTravelCertificateSpecificationsUseCaseImpl(
79+
GetTravelCertificateSpecificationsUseCaseImpl(
7780
apolloClient,
7881
)
7982

@@ -85,13 +88,13 @@ internal class GetTravelCertificateSpecificationsUseCaseTest {
8588

8689
assertThat(
8790
result,
88-
).isLeft().isInstanceOf<com.hedvig.android.feature.travelcertificate.data.TravelCertificateError.NotEligible>()
91+
).isLeft().isInstanceOf<TravelCertificateError.NotEligible>()
8992
}
9093

9194
@Test
9295
fun `when the passed contractId is right, we get TravelCertificateData`() = runTest {
9396
val travelCertificateUseCase =
94-
com.hedvig.android.feature.travelcertificate.data.GetTravelCertificateSpecificationsUseCaseImpl(
97+
GetTravelCertificateSpecificationsUseCaseImpl(
9598
apolloClient,
9699
)
97100

@@ -103,7 +106,6 @@ internal class GetTravelCertificateSpecificationsUseCaseTest {
103106
contractSpecifications = listOf(
104107
buildTravelCertificateContractSpecification {
105108
contractId = "id"
106-
email = "email"
107109
minStartDate = LocalDate.parse("2023-02-02")
108110
maxStartDate = LocalDate.parse("2023-03-02")
109111
maxDurationDays = 1
@@ -117,8 +119,8 @@ internal class GetTravelCertificateSpecificationsUseCaseTest {
117119
val result = travelCertificateUseCase.invoke("id")
118120

119121
assertThat(result).isRight().isEqualTo(
120-
com.hedvig.android.feature.travelcertificate.data.TravelCertificateData(
121-
com.hedvig.android.feature.travelcertificate.data.TravelCertificateData.TravelCertificateSpecification(
122+
TravelCertificateData(
123+
TravelCertificateData.TravelCertificateSpecification(
122124
contractId = "id",
123125
email = "email",
124126
maxDurationDays = 1,
@@ -132,7 +134,7 @@ internal class GetTravelCertificateSpecificationsUseCaseTest {
132134
@Test
133135
fun `when the passed contractId is correct, but the contract is not eligible, we get not eligible`() = runTest {
134136
val travelCertificateUseCase =
135-
com.hedvig.android.feature.travelcertificate.data.GetTravelCertificateSpecificationsUseCaseImpl(
137+
GetTravelCertificateSpecificationsUseCaseImpl(
136138
apolloClient,
137139
)
138140

@@ -144,7 +146,6 @@ internal class GetTravelCertificateSpecificationsUseCaseTest {
144146
contractSpecifications = listOf(
145147
buildTravelCertificateContractSpecification {
146148
contractId = "id"
147-
email = "email"
148149
minStartDate = LocalDate.parse("2023-02-02")
149150
maxStartDate = LocalDate.parse("2023-03-02")
150151
maxDurationDays = 1
@@ -159,33 +160,33 @@ internal class GetTravelCertificateSpecificationsUseCaseTest {
159160

160161
assertThat(
161162
result,
162-
).isLeft().isInstanceOf<com.hedvig.android.feature.travelcertificate.data.TravelCertificateError.NotEligible>()
163+
).isLeft().isInstanceOf<TravelCertificateError.NotEligible>()
163164
}
164165

165166
@Test
166167
fun `when the feature flag is on and the network request succeeds, the response depends on the active contract travel certificate eligibility`(
167168
@TestParameter contractSupportsTravelCertificate: Boolean,
168169
) = runTest {
169170
val travelCertificateUseCase =
170-
com.hedvig.android.feature.travelcertificate.data.GetTravelCertificateSpecificationsUseCaseImpl(
171+
GetTravelCertificateSpecificationsUseCaseImpl(
171172
apolloClient,
172173
)
173174

175+
val contractId = "contractId"
174176
apolloClient.enqueueTestResponse(
175177
TravelCertificateSpecificationsQuery(),
176178
TravelCertificateSpecificationsQuery.Data(OctopusFakeResolver) {
177179
currentMember = buildMember {
180+
activeContracts = listOf(
181+
buildContract {
182+
this.id = if (contractSupportsTravelCertificate) contractId else "non-matching ID"
183+
this.supportsTravelCertificate = true
184+
},
185+
)
178186
travelCertificateSpecifications = buildTravelCertificateSpecification {
179-
activeContracts = listOf(
180-
buildContract {
181-
id = "contractId"
182-
supportsTravelCertificate = contractSupportsTravelCertificate
183-
},
184-
)
185187
contractSpecifications = listOf(
186188
buildTravelCertificateContractSpecification {
187-
contractId = "contractId"
188-
email = "email"
189+
this.contractId = contractId
189190
minStartDate = LocalDate.parse("2023-02-02")
190191
maxStartDate = LocalDate.parse("2023-03-02")
191192
maxDurationDays = 1
@@ -200,9 +201,9 @@ internal class GetTravelCertificateSpecificationsUseCaseTest {
200201

201202
if (contractSupportsTravelCertificate) {
202203
assertThat(result).isRight().isEqualTo(
203-
com.hedvig.android.feature.travelcertificate.data.TravelCertificateData(
204-
com.hedvig.android.feature.travelcertificate.data.TravelCertificateData.TravelCertificateSpecification(
205-
contractId = "contractId",
204+
TravelCertificateData(
205+
TravelCertificateData.TravelCertificateSpecification(
206+
contractId = contractId,
206207
email = "email",
207208
maxDurationDays = 1,
208209
dateRange = LocalDate.parse("2023-02-02")..LocalDate.parse("2023-03-02"),
@@ -213,7 +214,7 @@ internal class GetTravelCertificateSpecificationsUseCaseTest {
213214
} else {
214215
assertThat(
215216
result,
216-
).isLeft().isInstanceOf<com.hedvig.android.feature.travelcertificate.data.TravelCertificateError.NotEligible>()
217+
).isLeft().isInstanceOf<TravelCertificateError.NotEligible>()
217218
}
218219
}
219220
}

gradle/libs.versions.toml

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,86 +5,86 @@ targetSdkVersion = "34"
55
minSdkVersion = "23"
66

77
# lint versions
8-
lintApi = "31.8.2"
9-
lintGradlePlugin = "8.8.2"
8+
lintApi = "31.10.0"
9+
lintGradlePlugin = "8.10.0"
1010

1111
# gradlePlugin versions
12-
androidGradlePlugin = "8.8.2"
13-
apolloAdapters = "0.0.4"
14-
apollo = "4.1.1"
12+
androidGradlePlugin = "8.10.0"
13+
apolloAdapters = "0.0.6"
14+
apollo = "4.2.0"
1515
cacheFix = "3.0.1"
1616
crashlytics = "3.0.3"
17-
datadogPlugin = "1.15.0"
17+
datadogPlugin = "1.16.0"
1818
doctor = "0.10.0"
19-
easylauncher = "6.4.0"
19+
easylauncher = "6.4.1"
2020
googleServices = "4.4.2"
21-
gradleDevelocity = "3.19.2"
21+
gradleDevelocity = "4.0.1"
2222
kotlin = "2.1.21"
23-
kotlinter = "5.0.1"
24-
ksp = "2.1.10-1.0.31"
25-
ktor = "3.1.1"
23+
kotlinter = "5.0.2"
24+
ksp = "2.1.21-2.0.1"
25+
ktor = "3.1.3"
2626
license = "0.9.8"
27-
molecule = "2.0.0"
27+
molecule = "2.1.0"
2828
squareSortDependencies = "0.14"
2929

3030
# Other versions sorted alphabetically
31-
accompanist = "0.37.2"
31+
accompanist = "0.37.3"
3232
androidx-activity-compose = "1.10.1"
3333
androidx-activity-core = "1.10.1"
3434
androidx-annotation = "1.9.1"
35-
androidx-composeBom = "2025.02.00"
35+
androidx-composeBom = "2025.05.00"
3636
#todo: remove this alpha when stable compose version bumps to 1.8
37-
androidx-datastore = "1.1.3"
37+
androidx-datastore = "1.1.6"
3838
androidx-junit = "1.2.1"
39-
androidx-lifecycle = "2.8.7"
40-
androidx-navigation = "2.8.7"
39+
androidx-lifecycle = "2.9.0"
40+
androidx-navigation = "2.9.0"
4141
androidx-other-appCompat = "1.7.0"
4242
androidx-other-browser = "1.8.0"
4343
androidx-other-constraintLayout = "2.2.0"
44-
androidx-other-core = "1.15.0"
45-
androidx-other-splashscreen = "1.2.0-beta01"
44+
androidx-other-core = "1.16.0"
45+
androidx-other-splashscreen = "1.2.0-beta02"
4646
androidx-other-startup = "1.2.0"
47-
androidx-other-workManager = "2.10.0"
47+
androidx-other-workManager = "2.10.1"
4848
androidx-test = "1.6.1"
4949
androidx-testRunners = "1.6.2"
50-
androidx-ui-alpha = "1.8.0-beta03"
50+
androidx-ui-alpha = "1.8.1"
5151
androidxGraphicsShapes = "1.0.1"
52-
arrow = "2.0.1"
52+
arrow = "2.1.2"
5353
assertK = "0.28.1"
5454
atomicfu = "0.27.0"
5555
coil = "2.7.0"
5656
composeRichtext = "1.0.0-alpha02"
5757
coreLibraryDesugaring = "2.1.5"
5858
coroutines = "1.10.2"
59-
datadog = "2.18.0"
60-
dependencyAnalysis = "2.10.1"
59+
datadog = "2.21.0"
60+
dependencyAnalysis = "2.17.0"
6161
firebaseCrashlyticsBuildtools = "3.0.3"
6262
hedvigAuthlib = "1.4.3"
6363
junit = "4.13.2"
64-
koinBom = "4.0.2"
64+
koinBom = "4.0.4"
6565
kotlinx-serialization = "1.8.1"
6666
kotlinxDatetime = "0.6.2"
67-
media3 = "1.5.1"
67+
media3 = "1.7.1"
6868
modalSheet = "0.7.0"
6969
moneta = "1.4.4"
7070
navigationRecentsUrlSharing = "1.0.0"
7171
okhttp = "4.12.0"
72-
okio = "3.10.2"
72+
okio = "3.11.0"
7373
paging = "3.3.6"
7474
playReview = "2.0.2"
75-
playServicesBase = "18.5.0"
76-
retrofit = "2.11.0"
75+
playServicesBase = "18.7.0"
76+
retrofit = "3.0.0"
7777
robolectric = "4.14.1"
78-
room = "2.7.0-rc01"
78+
room = "2.7.1"
7979
slimber = "2.0.0"
80-
sqlite = "2.5.0-rc01"
80+
sqlite = "2.5.1"
8181
testParameterInjector = "1.18"
8282
timber = "5.0.1"
8383
turbine = "1.2.0"
8484
unleash = "1.0.0"
8585
uuid = "0.8.4"
8686
zXing = "3.5.3"
87-
zoomable = "1.6.2"
87+
zoomable = "1.7.0"
8888

8989
[libraries]
9090

@@ -163,7 +163,7 @@ datadog-sdk-okhttp = { module = "com.datadoghq:dd-sdk-android-okhttp", version.r
163163
datadog-sdk-rum = { module = "com.datadoghq:dd-sdk-android-rum", version.ref = "datadog" }
164164
datadog-sdk-trace = { module = "com.datadoghq:dd-sdk-android-trace", version.ref = "datadog" }
165165
firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx" }
166-
firebase-bom = "com.google.firebase:firebase-bom:33.10.0"
166+
firebase-bom = "com.google.firebase:firebase-bom:33.13.0"
167167
firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-ktx" }
168168
firebase-dynamicLinks = { module = "com.google.firebase:firebase-dynamic-links" }
169169
firebase-messaging = { module = "com.google.firebase:firebase-messaging-ktx" }

0 commit comments

Comments
 (0)