From 35cfaad7aa1261b107418b881ca13b8d045c4e79 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Sep 2021 12:24:53 +0000 Subject: [PATCH 1/4] Bump kotlin from 1.5.30 to 1.5.31 Bumps `kotlin` from 1.5.30 to 1.5.31. Updates `kotlin-gradle-plugin` from 1.5.30 to 1.5.31 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.31/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.30...v1.5.31) Updates `kotlin-stdlib-jdk7` from 1.5.30 to 1.5.31 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.31/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.30...v1.5.31) Updates `kotlin-stdlib` from 1.5.30 to 1.5.31 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.31/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.30...v1.5.31) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk7 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 9d3fd85cd3..122eec668d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -9,7 +9,7 @@ ext.versions = [ def gradle = "7.0.2" // Ref: https://kotlinlang.org/releases.html -def kotlin = "1.5.30" +def kotlin = "1.5.31" def kotlinCoroutines = "1.5.1" def dagger = "2.38.1" def retrofit = "2.9.0" From d0623c298d56cfb2b6248c8e04c8ecf45100c3cd Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 23 Sep 2021 15:49:54 +0200 Subject: [PATCH 2/4] Also increase kotlinCoroutines (see https://kotlinlang.org/releases.html) --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 122eec668d..717c16bf2b 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -10,7 +10,7 @@ ext.versions = [ def gradle = "7.0.2" // Ref: https://kotlinlang.org/releases.html def kotlin = "1.5.31" -def kotlinCoroutines = "1.5.1" +def kotlinCoroutines = "1.5.2" def dagger = "2.38.1" def retrofit = "2.9.0" def arrow = "0.8.2" From a40cee337e6b8366b2070b14ff4fc218e83951e6 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 23 Sep 2021 15:52:01 +0200 Subject: [PATCH 3/4] Fix warning "This expression will be resolved to Int in future releases. Please add explicit conversion call" --- .../android/sdk/internal/session/sync/InitialSyncStrategy.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStrategy.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStrategy.kt index 7d93e30191..4bc866b36d 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStrategy.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/InitialSyncStrategy.kt @@ -39,7 +39,7 @@ sealed class InitialSyncStrategy { * Limit to reach to decide to split the init sync response into smaller files * Empiric value: 1 megabytes */ - val minSizeToSplit: Long = 1024 * 1024, + val minSizeToSplit: Long = 1_048_576, // 1024 * 1024 /** * Limit per room to reach to decide to store a join room ephemeral Events into a file * Empiric value: 1 kilobytes From 906da767277dab4fb9c7ad59d3fd5394f9555362 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 27 Sep 2021 15:55:58 +0200 Subject: [PATCH 4/4] Fix warning "This expression will be resolved to Int in future releases. Please add explicit conversion call" --- .../home/room/detail/timeline/url/PreviewUrlRetriever.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt index 4c018c8a99..c97fae055d 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt @@ -146,7 +146,7 @@ class PreviewUrlRetriever(session: Session, companion object { // One week in millis - private const val CACHE_VALIDITY: Long = 7 * 24 * 3_600 * 1_000 + private const val CACHE_VALIDITY = 604_800_000L // 7 * 24 * 3_600 * 1_000 private val blockedDomains = listOf( "https://matrix.to",