filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3568 from vector-im/dependabot/gradle/kotlin_version-1.5.20 

Bump kotlin_version from 1.5.10 to 1.5.20
This commit is contained in:
Benoit Marty 2021-06-25 19:11:34 +02:00 committed by GitHub
parent 2e37b5efa3 631e7881ef
commit 060e9d7a7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -2,7 +2,7 @@
buildscript { buildscript {
// Ref: https://kotlinlang.org/releases.html // 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" ext.kotlin_coroutines_version = "1.5.0"
repositories { repositories {
google() google()

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/WorkerParamsFactory.kt
View File

@ -46,7 +46,7 @@ internal object WorkerParamsFactory {
inline fun <reified T> fromData(data: Data) = fromData(T::class.java, data) inline fun <reified T> fromData(data: Data) = fromData(T::class.java, data)
fun <T> fromData(clazz: Class<T>, data: Data): T? = tryOrNull("Unable to parse work parameters") { fun <T> fromData(clazz: Class<T>, data: Data): T? = tryOrNull<T?>("Unable to parse work parameters") {
val json = data.getString(KEY) val json = data.getString(KEY)
return if (json == null) { return if (json == null) {
null null