Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Kotlin to 1.6.10 #1015

Merged
merged 4 commits into from
Nov 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 0 additions & 2 deletions aztec/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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>> {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 0 additions & 2 deletions glide-loader/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ android {
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$gradle.ext.kotlinVersion"

implementation aztecProjectDependency
implementation "com.github.bumptech.glide:glide:$glideVersion"
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions picasso-loader/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pluginManagement {
gradle.ext.kotlinVersion = '1.4.20'
gradle.ext.kotlinVersion = '1.6.10'
gradle.ext.agpVersion = '7.2.1'

plugins {
Expand Down
2 changes: 0 additions & 2 deletions wordpress-comments/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 0 additions & 2 deletions wordpress-shortcodes/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ android {
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$gradle.ext.kotlinVersion"

implementation aztecProjectDependency

implementation 'androidx.appcompat:appcompat:1.0.0'
Expand Down