From b1a1b4651e9c6caa8d8859c063b5abc617c042cc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Jun 2021 23:09:29 +0000 Subject: [PATCH 1/2] Bump kotlin_version from 1.5.10 to 1.5.20 Bumps `kotlin_version` from 1.5.10 to 1.5.20. Updates `kotlin-gradle-plugin` from 1.5.10 to 1.5.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.20/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.10...v1.5.20) Updates `kotlin-stdlib-jdk7` from 1.5.10 to 1.5.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.20/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.10...v1.5.20) Updates `kotlin-stdlib` from 1.5.10 to 1.5.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.20/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.10...v1.5.20) --- 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] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b213066423..b6c4a17559 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { // Ref: https://kotlinlang.org/releases.html - ext.kotlin_version = '1.5.10' + ext.kotlin_version = '1.5.20' ext.kotlin_coroutines_version = "1.5.0" repositories { google() From 631e7881efe3fb168a276493362ead723ca36bcb Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 25 Jun 2021 17:42:38 +0200 Subject: [PATCH 2/2] Fix warning about implicit type, introduced in Kotlin 1.5.20. "Returning type parameter has been inferred to Nothing implicitly. Please specify type arguments explicitly to hide this warning. Nothing can produce an exception at runtime." --- .../matrix/android/sdk/internal/worker/WorkerParamsFactory.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/WorkerParamsFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/WorkerParamsFactory.kt index 7aed74d2ca..7a47270efd 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/WorkerParamsFactory.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/WorkerParamsFactory.kt @@ -46,7 +46,7 @@ internal object WorkerParamsFactory { inline fun fromData(data: Data) = fromData(T::class.java, data) - fun fromData(clazz: Class, data: Data): T? = tryOrNull("Unable to parse work parameters") { + fun fromData(clazz: Class, data: Data): T? = tryOrNull("Unable to parse work parameters") { val json = data.getString(KEY) return if (json == null) { null