From ecd277cd81f37f65e89ba8f53f622156563bb1f6 Mon Sep 17 00:00:00 2001 From: Mygod Date: Thu, 23 Jul 2020 07:37:09 +0800 Subject: [PATCH] Update dependencies --- mobile/build.gradle.kts | 6 +++--- mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts index 1631b9fa..c777a828 100644 --- a/mobile/build.gradle.kts +++ b/mobile/build.gradle.kts @@ -67,7 +67,7 @@ android { } dependencies { - val lifecycleVersion = "2.3.0-alpha05" + val lifecycleVersion = "2.3.0-alpha06" val roomVersion = "2.2.5" coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.0.9") @@ -75,9 +75,9 @@ dependencies { implementation(kotlin("stdlib-jdk8", rootProject.extra.get("kotlinVersion").toString())) implementation("androidx.appcompat:appcompat:1.3.0-alpha01") // https://issuetracker.google.com/issues/151603528 implementation("androidx.browser:browser:1.2.0") - implementation("androidx.core:core-ktx:1.3.0") + implementation("androidx.core:core-ktx:1.3.1") implementation("androidx.emoji:emoji:1.1.0") - implementation("androidx.fragment:fragment-ktx:1.3.0-alpha06") + implementation("androidx.fragment:fragment-ktx:1.3.0-alpha07") implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") diff --git a/mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt b/mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt index e1e02f6e..59c04b6c 100644 --- a/mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt +++ b/mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt @@ -36,6 +36,7 @@ class RootServer @JvmOverloads constructor(private val warnLogger: (String) -> U suspend fun sendClosed() = withContext(NonCancellable) { server.execute(CancelCommand(index)) } private fun initException(targetClass: Class<*>, message: String): Throwable { + @Suppress("NAME_SHADOWING") var targetClass = targetClass while (true) { try { @@ -468,7 +469,7 @@ class RootServer @JvmOverloads constructor(private val warnLogger: (String) -> U val commandJob = Job() cancellables[callback] = { commandJob.cancel() } defaultWorker.launch(commandJob) { - val result = try { + try { val result = command.execute() withContext(callbackWorker + NonCancellable) { output.pushResult(callback, result) } } catch (e: Throwable) {