From b9290f211d2ef0a460f8d494e9214dc40e9b3ac4 Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Thu, 5 Feb 2026 08:08:16 -0500 Subject: [PATCH 1/2] fix: remove unnecessary safe property access these were non-null properties and do not need safe access, it is flagged as a warning (which we fail on with -Werror) in new kotlin --- .../ichi2/anki/dialogs/customstudy/TagLimitFragment.kt | 8 ++++---- AnkiDroid/src/test/java/com/ichi2/anki/AnalyticsTest.kt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/TagLimitFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/TagLimitFragment.kt index 84778b8a1a56..5899b56c7017 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/TagLimitFragment.kt +++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/customstudy/TagLimitFragment.kt @@ -132,8 +132,8 @@ class TagLimitFragment : DialogFragment() { override fun onStart() { super.onStart() lifecycleScope.launch { - binding.loadingViews?.isVisible = true - binding.contentViews?.isVisible = false + binding.loadingViews.isVisible = true + binding.contentViews.isVisible = false val customStudyDefaults = withCol { sched.customStudyDefaults(deckId) } binding.requireOneOrMoreCheckBox.isChecked = customStudyDefaults.tagsList.any { tag -> tag.include } @@ -143,8 +143,8 @@ class TagLimitFragment : DialogFragment() { } tagsIncludedAdapter.tags = tags.toMutableList() // make a copy tagsExcludedAdapter.tags = tags.toMutableList() // make a copy - binding.loadingViews?.isVisible = false - binding.contentViews?.isVisible = true + binding.loadingViews.isVisible = false + binding.contentViews.isVisible = true } } diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/AnalyticsTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/AnalyticsTest.kt index 1f9064fc1004..e0adb9313c70 100644 --- a/AnkiDroid/src/test/java/com/ichi2/anki/AnalyticsTest.kt +++ b/AnkiDroid/src/test/java/com/ichi2/anki/AnalyticsTest.kt @@ -117,7 +117,7 @@ class AnalyticsTest { // prepare analytics so we can inspect what happens val spyHit = spy(ExceptionHit()) - doReturn(spyHit).whenever(analytics)?.exception() + doReturn(spyHit).whenever(analytics).exception() try { UsageAnalytics.sendAnalyticsException(grandparentException, false) } catch (e: Exception) { From 3f970bb65bc73e281fadd332ea36768146aa0d93 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Dec 2025 12:22:52 +0000 Subject: [PATCH 2/2] build(deps): bump kotlin from 2.2.10 to 2.3.0 Bumps `kotlin` from 2.2.10 to 2.3.0. Updates `org.jetbrains.kotlin:kotlin-stdlib` from 2.2.10 to 2.3.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `org.jetbrains.kotlin:kotlin-reflect` from 2.2.10 to 2.3.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `org.jetbrains.kotlin:kotlin-test` from 2.2.10 to 2.3.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `org.jetbrains.kotlin:kotlin-test-junit` from 2.2.10 to 2.3.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `org.jetbrains.kotlin:kotlin-test-junit5` from 2.2.10 to 2.3.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `org.jetbrains.kotlin.android` from 2.2.10 to 2.3.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `org.jetbrains.kotlin.plugin.parcelize` from 2.2.10 to 2.3.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `org.jetbrains.kotlin.jvm` from 2.2.10 to 2.3.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `org.jetbrains.kotlin.plugin.serialization` from 2.2.10 to 2.3.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-version: 2.3.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-version: 2.3.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-test dependency-version: 2.3.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-test-junit dependency-version: 2.3.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-test-junit5 dependency-version: 2.3.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.android dependency-version: 2.3.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.plugin.parcelize dependency-version: 2.3.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.jvm dependency-version: 2.3.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin.plugin.serialization dependency-version: 2.3.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] build(deps): bump kotlin from 2.3.0 to 2.3.10 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 97cacc0f8d56..3fc2c8d0450f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -89,7 +89,7 @@ androidTestJunit = "1.3.0" # https://github.com/junit-team/junit5/releases/ junit = "6.0.2" # https://github.com/JetBrains/kotlin/releases/ -kotlin = '2.2.10' +kotlin = '2.3.10' # https://github.com/Kotlin/kotlinx.serialization/releases kotlinxSerializationJson = "1.10.0" ktlintGradlePlugin = "14.0.1"