Merge pull request #1015 from wordpress-mobile/build/update-kotlin-to-1.6.10

Update Kotlin to 1.6.10

Author: ParaskP7

app/build.gradle

@@ -41,7 +41,6 @@ dependencies {
     implementation project(':wordpress-shortcodes')
     implementation project(':media-placeholders')
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$gradle.ext.kotlinVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutinesVersion"
 

aztec/build.gradle

@@ -48,8 +48,6 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$gradle.ext.kotlinVersion"
-
     implementation "org.ccil.cowan.tagsoup:tagsoup:$tagSoupVersion"
     implementation "org.jsoup:jsoup:$jSoupVersion"
 

aztec/src/main/kotlin/org/wordpress/aztec/spans/IAztecNestable.kt

@@ -12,7 +12,7 @@ interface IAztecNestable {
         fun getNestingLevelAt(spanned: Spanned, index: Int, nextIndex: Int = index): Int {
             return spanned.getSpans(index, nextIndex, IAztecNestable::class.java)
                     .filter { spanned.getSpanEnd(it) != index || index == 0 || spanned[index - 1] != Constants.NEWLINE }
-                    .maxBy { it.nestingLevel }?.nestingLevel ?: 0
+                    .maxByOrNull { it.nestingLevel }?.nestingLevel ?: 0
         }
 
         fun getMinNestingLevelAt(spanned: Spanned, index: Int, nextIndex: Int = index): Int {
@@ -21,7 +21,7 @@ interface IAztecNestable {
                     .filter { spanned.getSpanStart(it) <= index && spanned.getSpanEnd(it) >= nextIndex &&
                             (spanned.getSpanStart(it) != index || spanned.getSpanEnd(it) != nextIndex) }
                     .filter { index != nextIndex || spanned.getSpanStart(it) != index && spanned.getSpanEnd(it) != index }
-                    .minBy { it.nestingLevel }?.nestingLevel ?: 0
+                    .minByOrNull { it.nestingLevel }?.nestingLevel ?: 0
         }
 
         fun pushDeeper(spannable: Spannable, start: Int, end: Int, fromLevel: Int = 0, pushBy: Int = 1): List<SpanWrapper<IAztecNestable>> {

build.gradle

@@ -61,7 +61,7 @@ ext {
     tagSoupVersion = '1.2.1'
     glideVersion = '4.10.0'
     picassoVersion = '2.5.2'
-    robolectricVersion = '4.4'
+    robolectricVersion = '4.9'
     jUnitVersion = '4.12'
     jSoupVersion = '1.11.3'
     wordpressUtilsVersion = 'trunk-1ed207c03d2242b6fc3d74f9e388e9163cbc82a6'

glide-loader/build.gradle

@@ -24,8 +24,6 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$gradle.ext.kotlinVersion"
-
     implementation aztecProjectDependency
     implementation "com.github.bumptech.glide:glide:$glideVersion"
 }

gradle.properties

@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
-org.gradle.jvmargs=-Xmx1536m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx1536m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 android.enableJetifier=false
 android.useAndroidX=true
 

picasso-loader/build.gradle

@@ -23,8 +23,6 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$gradle.ext.kotlinVersion"
-
     implementation aztecProjectDependency
 
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'

settings.gradle

@@ -1,5 +1,5 @@
 pluginManagement {
-    gradle.ext.kotlinVersion = '1.4.20'
+    gradle.ext.kotlinVersion = '1.6.10'
     gradle.ext.agpVersion = '7.2.1'
 
     plugins {

wordpress-comments/build.gradle

@@ -35,8 +35,6 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$gradle.ext.kotlinVersion"
-
     implementation aztecProjectDependency
 
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'

wordpress-shortcodes/build.gradle

@@ -34,8 +34,6 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$gradle.ext.kotlinVersion"
-
     implementation aztecProjectDependency
 
     implementation 'androidx.appcompat:appcompat:1.0.0'