From 99f77c092a6c032e908885c33973056c900b2835 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Mar 2025 20:19:38 +0000 Subject: [PATCH 1/3] Bump org.jetbrains.kotlin.android from 2.1.10 to 2.1.20 Bumps [org.jetbrains.kotlin.android](https://github.com/JetBrains/kotlin) from 2.1.10 to 2.1.20. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.1.10...v2.1.20) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin.android dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6cf233b33e..1a25308e5a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { id("com.android.application") version "8.9.0" apply false - id("org.jetbrains.kotlin.android") version "2.1.10" apply false + id("org.jetbrains.kotlin.android") version "2.1.20" apply false id("androidx.navigation.safeargs.kotlin") version "2.8.9" apply false id("com.starter.easylauncher") version "6.4.0" apply false id("org.jetbrains.kotlin.plugin.parcelize") version "2.1.10" apply false From 1f2cde9e12ffbad0223552e16dc6feea7e1ebecd Mon Sep 17 00:00:00 2001 From: denbond7 Date: Mon, 24 Mar 2025 11:38:02 +0200 Subject: [PATCH 2/3] Modified dependabot.yml. Updated other group dependencies. --- .github/dependabot.yml | 6 ++++++ FlowCrypt/build.gradle.kts | 2 +- build.gradle.kts | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 72bd8b6041..4511f07681 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -42,4 +42,10 @@ updates: applies-to: version-updates patterns: - "com.squareup.okhttp3*" + + kotlin: + applies-to: version-updates + patterns: + - "org.jetbrains.kotlin*" + - "com.google.devtools.ksp*" open-pull-requests-limit: 10 diff --git a/FlowCrypt/build.gradle.kts b/FlowCrypt/build.gradle.kts index 642557579a..15bbb6dfdc 100644 --- a/FlowCrypt/build.gradle.kts +++ b/FlowCrypt/build.gradle.kts @@ -406,7 +406,7 @@ dependencies { testImplementation("com.shazam:shazamcrest:0.11") testImplementation("org.robolectric:robolectric:4.14.1") //we need it to test Parcelable implementation - testImplementation("org.jetbrains.kotlin:kotlin-reflect:2.1.10") + testImplementation("org.jetbrains.kotlin:kotlin-reflect:2.1.20") testImplementation("junit:junit:4.13.2") testImplementation("androidx.room:room-testing:2.6.1") testImplementation("io.github.classgraph:classgraph:4.8.179") diff --git a/build.gradle.kts b/build.gradle.kts index 1a25308e5a..6860df9821 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,8 +10,8 @@ plugins { id("org.jetbrains.kotlin.android") version "2.1.20" apply false id("androidx.navigation.safeargs.kotlin") version "2.8.9" apply false id("com.starter.easylauncher") version "6.4.0" apply false - id("org.jetbrains.kotlin.plugin.parcelize") version "2.1.10" apply false - id("com.google.devtools.ksp") version "2.1.10-1.0.31" apply false + id("org.jetbrains.kotlin.plugin.parcelize") version "2.1.20" apply false + id("com.google.devtools.ksp") version "2.1.20-1.0.31" apply false id("org.ajoberstar.grgit") version "5.3.0" apply false } From 7d85444a44ecdb00f0e55761bb7e13eca953fb4a Mon Sep 17 00:00:00 2001 From: denbond7 Date: Mon, 24 Mar 2025 15:49:17 +0200 Subject: [PATCH 3/3] SearchMessagesGmailApiFlowTest.testSearchMessages() when nextPageToken is null --- .../com/flowcrypt/email/jetpack/viewmodel/MessagesViewModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MessagesViewModel.kt b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MessagesViewModel.kt index a8102d99f1..9bad8f7342 100644 --- a/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MessagesViewModel.kt +++ b/FlowCrypt/src/main/java/com/flowcrypt/email/jetpack/viewmodel/MessagesViewModel.kt @@ -703,7 +703,7 @@ class MessagesViewModel(application: Application) : AccountViewModel(application ) ) - val nextPageToken: String + val nextPageToken: String? val gmailThreadInfoList: List val messages = if (accountEntity.useConversationMode) { val threadsResponse = GmailApiHelper.loadThreads(