[Android] Upgrade Kotlin & kotlinx

Geoffrey Métais git at videolan.org
Fri Apr 26 17:16:05 CEST 2019


vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Fri Apr 26 17:15:38 2019 +0200| [0a22c1e4bb04f229cce690e2e75904e8ccb08e47] | committer: Geoffrey Métais

Upgrade Kotlin & kotlinx

> https://code.videolan.org/videolan/vlc-android/commit/0a22c1e4bb04f229cce690e2e75904e8ccb08e47
---

 build.gradle                                         | 4 ++--
 vlc-android/src/org/videolan/vlc/media/MediaUtils.kt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 775b4ef93..cc98ceaec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext.android_plugin_version = '3.4.0'
-    ext.kotlin_version = '1.3.30'
-    ext.kotlinx_version = '1.1.1'
+    ext.kotlin_version = '1.3.31'
+    ext.kotlinx_version = '1.2.1'
     repositories {
         flatDir dirs: "gradle/plugins"
         google()
diff --git a/vlc-android/src/org/videolan/vlc/media/MediaUtils.kt b/vlc-android/src/org/videolan/vlc/media/MediaUtils.kt
index b0d154e88..bc0163c3c 100644
--- a/vlc-android/src/org/videolan/vlc/media/MediaUtils.kt
+++ b/vlc-android/src/org/videolan/vlc/media/MediaUtils.kt
@@ -363,7 +363,7 @@ object MediaUtils : CoroutineScope {
     @ObsoleteCoroutinesApi
     private class SuspendDialogCallback (context: Context, private val task: suspend (service: PlaybackService) -> Unit) : BaseCallBack() {
         private lateinit var dialog: ProgressDialog
-        var job = Job()
+        var job : Job = Job()
         val actor = actor<Action>(capacity = Channel.UNLIMITED) {
             for (action in channel) when (action) {
                 Connect -> {



More information about the Android mailing list