Skip to content

Commit 3cf5bf8

Browse files
Update kotlin to 2.3.10. (#12373)
1 parent c166952 commit 3cf5bf8

69 files changed

Lines changed: 4733 additions & 4681 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ jobs:
4545
include:
4646
- language: actions
4747
build-mode: none
48-
- language: java-kotlin
49-
build-mode: autobuild
48+
# - language: java-kotlin
49+
# build-mode: autobuild
5050
- language: javascript-typescript
5151
build-mode: none
5252
- language: python

‎3ds2playground/dependencies/dependencies.txt‎

Lines changed: 53 additions & 55 deletions
Large diffs are not rendered by default.

‎3ds2sdk/dependencies/dependencies.txt‎

Lines changed: 48 additions & 50 deletions
Large diffs are not rendered by default.

‎3ds2sdk/src/test/kotlin/com/stripe/android/stripe3ds2/transactions/ChallengeResponseDataTest.kt‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -192,29 +192,29 @@ class ChallengeResponseDataTest {
192192
assertNotNull(cresData.issuerImage)
193193
assertEquals(
194194
"http://acs.com/medium_image.png",
195-
cresData.issuerImage?.mediumUrl
195+
cresData.issuerImage.mediumUrl
196196
)
197197
assertEquals(
198198
"http://acs.com/high_image.png",
199-
cresData.issuerImage?.highUrl
199+
cresData.issuerImage.highUrl
200200
)
201201
assertEquals(
202202
"http://acs.com/extraHigh_image.png",
203-
cresData.issuerImage?.extraHighUrl
203+
cresData.issuerImage.extraHighUrl
204204
)
205205

206206
assertNotNull(cresData.paymentSystemImage)
207207
assertEquals(
208208
"http://ds.com/medium_image.png",
209-
cresData.paymentSystemImage?.mediumUrl
209+
cresData.paymentSystemImage.mediumUrl
210210
)
211211
assertEquals(
212212
"http://ds.com/high_image.png",
213-
cresData.paymentSystemImage?.highUrl
213+
cresData.paymentSystemImage.highUrl
214214
)
215215
assertEquals(
216216
"http://ds.com/extraHigh_image.png",
217-
cresData.paymentSystemImage?.extraHighUrl
217+
cresData.paymentSystemImage.extraHighUrl
218218
)
219219

220220
assertEquals("Click here to open Your Bank App", cresData.oobAppLabel)
@@ -254,33 +254,33 @@ class ChallengeResponseDataTest {
254254
assertNotNull(cresData.paymentSystemImage)
255255
assertEquals(
256256
"http://ds.com/medium_image.png",
257-
cresData.paymentSystemImage?.getUrlForDensity(DisplayMetrics.DENSITY_LOW)
257+
cresData.paymentSystemImage.getUrlForDensity(DisplayMetrics.DENSITY_LOW)
258258
)
259259
assertEquals(
260260
"http://ds.com/medium_image.png",
261-
cresData.paymentSystemImage?.getUrlForDensity(DisplayMetrics.DENSITY_MEDIUM)
261+
cresData.paymentSystemImage.getUrlForDensity(DisplayMetrics.DENSITY_MEDIUM)
262262
)
263263

264264
assertEquals(
265265
"http://ds.com/high_image.png",
266-
cresData.paymentSystemImage?.getUrlForDensity(DisplayMetrics.DENSITY_MEDIUM + 1)
266+
cresData.paymentSystemImage.getUrlForDensity(DisplayMetrics.DENSITY_MEDIUM + 1)
267267
)
268268
assertEquals(
269269
"http://ds.com/high_image.png",
270-
cresData.paymentSystemImage?.getUrlForDensity(DisplayMetrics.DENSITY_HIGH)
270+
cresData.paymentSystemImage.getUrlForDensity(DisplayMetrics.DENSITY_HIGH)
271271
)
272272
assertEquals(
273273
"http://ds.com/high_image.png",
274-
cresData.paymentSystemImage?.getUrlForDensity(DisplayMetrics.DENSITY_XHIGH - 1)
274+
cresData.paymentSystemImage.getUrlForDensity(DisplayMetrics.DENSITY_XHIGH - 1)
275275
)
276276

277277
assertEquals(
278278
"http://ds.com/extraHigh_image.png",
279-
cresData.paymentSystemImage?.getUrlForDensity(DisplayMetrics.DENSITY_XHIGH)
279+
cresData.paymentSystemImage.getUrlForDensity(DisplayMetrics.DENSITY_XHIGH)
280280
)
281281
assertEquals(
282282
"http://ds.com/extraHigh_image.png",
283-
cresData.paymentSystemImage?.getUrlForDensity(DisplayMetrics.DENSITY_XXHIGH)
283+
cresData.paymentSystemImage.getUrlForDensity(DisplayMetrics.DENSITY_XXHIGH)
284284
)
285285
}
286286

@@ -321,14 +321,14 @@ class ChallengeResponseDataTest {
321321

322322
assertNotNull(cresData.acsHtml)
323323
assertTrue(
324-
true == cresData.acsHtml?.contains(
324+
cresData.acsHtml.contains(
325325
"<title>3DS - One-Time Passcode - PA</title>"
326326
)
327327
)
328328

329329
assertNotNull(cresData.acsHtmlRefresh)
330330
assertTrue(
331-
true == cresData.acsHtmlRefresh?.contains(
331+
cresData.acsHtmlRefresh.contains(
332332
"<p>Tap continue once you have verified this payment.</p>"
333333
)
334334
)

‎3ds2sdk/src/test/kotlin/com/stripe/android/stripe3ds2/views/ChallengeFragmentTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,15 +229,15 @@ class ChallengeFragmentTest {
229229
assertFalse(challengeZoneView.infoTextView.isShown)
230230
assertFalse(challengeZoneView.submitButton.isShown)
231231

232-
assertNotNull(fragment.challengeZoneWebView?.onClickListener)
232+
assertNotNull(fragment.challengeZoneWebView.onClickListener)
233233
}
234234
}
235235

236236
@Test
237237
fun refreshUi_htmlOOB_acsRefreshHtmlDisplayed() {
238238
createFragment(cres = CRES_HTML_DATA) { fragment ->
239239
fragment.refreshUi()
240-
assertThat(fragment.challengeZoneWebView?.webView)
240+
assertThat(fragment.challengeZoneWebView.webView)
241241
.isNotNull()
242242
}
243243
}

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44

55
## 22.8.1 - 2026-02-17
66

7+
Dependencies updated in [12373](https://github.com/stripe/stripe-android/pull/12373):
8+
- Bumped Kotlin from 2.1.10 to 2.3.10.
9+
- Bumped Kotlin Coroutines from 1.10.1 to 1.10.2.
10+
- Bumped Kotlin Serialization from 1.8.0 to 1.10.0.
11+
- Bumped Android Gradle Plugin from 8.13.1 to 8.13.2.
12+
- Bumped Poko from 0.18.2 to 0.21.1.
13+
714
### Identity
815
* [Added] More live feedback during document capture.
916
* [Added] Added best frame detector to improve document capture quality.

‎build-configuration/detekt.gradle‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,22 @@ detekt {
1515
}
1616
}
1717

18+
def detektIgnoreFile = file('.detektignore')
19+
if (detektIgnoreFile.exists()) {
20+
def detektIgnorePatterns = []
21+
detektIgnoreFile.eachLine { line ->
22+
line = line.trim()
23+
if (!line.isEmpty() && !line.startsWith('#')) {
24+
detektIgnorePatterns.add(line)
25+
}
26+
}
27+
afterEvaluate {
28+
tasks.matching { it.name.startsWith('detekt') && it instanceof org.gradle.api.tasks.SourceTask }.configureEach {
29+
detektIgnorePatterns.each { pattern -> exclude(pattern) }
30+
}
31+
}
32+
}
33+
1834
dependencies {
1935
detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:$versions.detekt"
2036
detektPlugins "io.gitlab.arturbosch.detekt:detekt-cli:$versions.detekt"

‎build-configuration/ktlint.gradle‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,29 @@ dependencies {
66
ktlint("com.pinterest.ktlint:ktlint-cli:${versions.ktlint}")
77
}
88

9+
def ktlintIgnoreArgs = []
10+
def ktlintIgnoreFile = file('.ktlintignore')
11+
if (ktlintIgnoreFile.exists()) {
12+
ktlintIgnoreFile.eachLine { line ->
13+
line = line.trim()
14+
if (!line.isEmpty() && !line.startsWith('#')) {
15+
ktlintIgnoreArgs.add("!${line}")
16+
}
17+
}
18+
}
19+
920
task ktlint(type: JavaExec, group: "verification") {
1021
description = "Check Kotlin code style."
1122
mainClass = "com.pinterest.ktlint.Main"
1223
classpath = configurations.ktlint
1324
args "src/**/*.kt"
25+
args ktlintIgnoreArgs
1426
}
1527

1628
task ktlintFormat(type: JavaExec, group: "formatting") {
1729
description = "Fix Kotlin code style deviations."
1830
mainClass = "com.pinterest.ktlint.Main"
1931
classpath = configurations.ktlint
2032
args "-F", "src/**/*.kt"
33+
args ktlintIgnoreArgs
2134
}

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ buildscript {
2929
plugins {
3030
id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'
3131
id 'io.codearte.nexus-staging' version '0.30.0'
32-
id 'com.google.devtools.ksp' version '2.1.10-1.0.30' apply false
33-
id 'dev.drewhamilton.poko' version '0.18.2' apply false
34-
id 'org.jetbrains.kotlin.jvm' version '2.1.10' apply false
32+
id 'com.google.devtools.ksp' version '2.3.6' apply false
33+
id 'dev.drewhamilton.poko' version '0.21.1' apply false
34+
id 'org.jetbrains.kotlin.jvm' version '2.3.10' apply false
3535
id 'com.emergetools.android' version '4.3.0' apply false
3636
id 'com.google.dagger.hilt.android' version '2.58' apply false
3737
}

0 commit comments

Comments
 (0)