Skip to content

Commit 40b0505

Browse files
authored
Merge pull request #772 from wordpress-mobile/bump_kotlin_and_coroutines_version
Increase kotlin and coroutines version to the next stable
2 parents d8675f5 + 2d8bcc2 commit 40b0505

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

aztec/build.gradle

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ android {
2929
includeAndroidResources = true
3030
}
3131
}
32-
33-
// enable kotlin coroutines
34-
kotlin { experimental { coroutines "enable" } }
3532
}
3633

3734
dependencies {
@@ -48,6 +45,6 @@ dependencies {
4845
testImplementation "junit:junit:$jUnitVersion"
4946
testImplementation "org.robolectric:robolectric:$robolectricVersion"
5047

51-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.26.1'
52-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:0.26.1'
48+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesVersion"
49+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutinesVersion"
5350
}

aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,9 @@ import android.view.WindowManager
5555
import android.view.inputmethod.BaseInputConnection
5656
import android.widget.CheckBox
5757
import android.widget.EditText
58-
import kotlinx.coroutines.experimental.Dispatchers
59-
import kotlinx.coroutines.experimental.android.Main
60-
import kotlinx.coroutines.experimental.runBlocking
61-
import kotlinx.coroutines.experimental.withContext
58+
import kotlinx.coroutines.Dispatchers
59+
import kotlinx.coroutines.runBlocking
60+
import kotlinx.coroutines.withContext
6261
import org.wordpress.android.util.AppLog
6362
import org.wordpress.android.util.ImageUtils
6463
import org.wordpress.aztec.formatting.BlockFormatter

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
buildscript {
22
ext {
33
gradlePluginVersion = '3.1.3'
4-
kotlinVersion = '1.2.41'
4+
kotlinVersion = '1.3.11'
5+
kotlinCoroutinesVersion = '1.1.0'
56
supportLibVersion = '27.1.1'
67
tagSoupVersion = '1.2.1'
78
glideVersion = '3.7.0'

0 commit comments

Comments
 (0)