From 411912494066e958b3394ae5a48b9a1ca7fed7d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 17 Sep 2022 21:27:03 +0000 Subject: [PATCH 1/2] Bump kotlin_version from 1.6.21 to 1.7.10 Bumps `kotlin_version` from 1.6.21 to 1.7.10. Updates `kotlin-gradle-plugin` from 1.6.21 to 1.7.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) Updates `kotlin-stdlib` from 1.6.21 to 1.7.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0aa550f9d2..7ea2c83daa 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { jacoco_version = '0.8.8' - kotlin_version = '1.6.21' + kotlin_version = '1.7.10' androidxTestVersion = "1.4.0" daggerVersion = "2.43.2" markwonVersion = "4.6.2" From 45bcd5e33a5d0ee2e6068b8171d228a3126bb351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Brey?= Date: Sat, 17 Sep 2022 23:50:54 +0200 Subject: [PATCH 2/2] PassCodeManager: fix compilation error with kotlin 1.7.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Brey --- .../java/com/owncloud/android/authentication/PassCodeManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/owncloud/android/authentication/PassCodeManager.kt b/app/src/main/java/com/owncloud/android/authentication/PassCodeManager.kt index 9717bb4de3..277be46a37 100644 --- a/app/src/main/java/com/owncloud/android/authentication/PassCodeManager.kt +++ b/app/src/main/java/com/owncloud/android/authentication/PassCodeManager.kt @@ -121,7 +121,7 @@ class PassCodeManager(private val preferences: AppPreferences, private val clock visibleActivitiesCounter-- } val powerMgr = activity.getSystemService(Context.POWER_SERVICE) as PowerManager - if ((isPassCodeEnabled() || deviceCredentialsAreEnabled(activity)) && !powerMgr?.isScreenOn) { + if ((isPassCodeEnabled() || deviceCredentialsAreEnabled(activity)) && !powerMgr.isScreenOn) { activity.moveTaskToBack(true) } }