From 13878c8e7e22a61bb2045a88a15006d86e976c66 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Aug 2021 23:09:38 +0000 Subject: [PATCH 1/3] Bump kotlin_version from 1.5.21 to 1.5.30 Bumps `kotlin_version` from 1.5.21 to 1.5.30. Updates `kotlin-gradle-plugin` from 1.5.21 to 1.5.30 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.30/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.21...v1.5.30) Updates `kotlin-stdlib-jdk7` from 1.5.21 to 1.5.30 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.30/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.21...v1.5.30) Updates `kotlin-stdlib` from 1.5.21 to 1.5.30 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.30/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.21...v1.5.30) --- 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 ef26530298..54174c1ddc 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { // Ref: https://kotlinlang.org/releases.html - ext.kotlin_version = '1.5.21' + ext.kotlin_version = '1.5.30' ext.kotlin_coroutines_version = "1.5.0" repositories { google() From 34edc794507646b16a98da670a1316ef3c93fed6 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 30 Aug 2021 10:13:20 +0200 Subject: [PATCH 2/3] Fix warning "Opt-in requirement marker annotation on override requires the same marker on base declaration (will be an error in 1.6)" --- .../app/features/settings/locale/LocalePickerController.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt index 0d178bddea..4e1c62a4ec 100644 --- a/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt +++ b/vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt @@ -37,7 +37,6 @@ class LocalePickerController @Inject constructor( var listener: Listener? = null - @ExperimentalStdlibApi override fun buildModels(data: LocalePickerViewState?) { val list = data?.locales ?: return val host = this From d773fb41357f6b7353f07cbecb2ebbefdf5e3c28 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 30 Aug 2021 14:45:54 +0200 Subject: [PATCH 3/3] Also upgrade kotlin_coroutines_version to 1.5.1 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 54174c1ddc..800c4a713b 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { // Ref: https://kotlinlang.org/releases.html ext.kotlin_version = '1.5.30' - ext.kotlin_coroutines_version = "1.5.0" + ext.kotlin_coroutines_version = "1.5.1" repositories { google() jcenter()