Commit 38d31db5 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

5352-Conversation_part_disappear_on_conversation_list_issue

issue: https://gitlab.e.foundation/e/backlog/-/issues/5352

dependency update causes the part disappear without reason. Most
probably it is bug in latest android library. This commit revert back
the build dependencies same as upstream/master.
parent 3ca5ef9c
Pipeline #185017 failed with stage
in 2 minutes and 19 seconds
image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest"
image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:legacy"
stages:
- update-from-upstream
......
......@@ -3,7 +3,7 @@
buildscript {
ext.androidx_appcompat_version = '1.1.0'
ext.androidx_constraintlayout_version = '1.1.3'
ext.androidx_core_version = '1.2.0'
ext.androidx_core_version = '1.1.0'
ext.androidx_emoji_version = '1.0.0'
ext.androidx_exifinterface_version = '1.0.0'
ext.androidx_testrunner_version = '1.1.0-alpha3'
......@@ -17,13 +17,13 @@ buildscript {
ext.exoplayer_version = "2.8.1"
ext.glide_version = "4.8.0"
ext.junit_version = '4.12'
ext.kotlin_version = '1.5.31'
ext.kotlin_version = '1.3.60'
ext.lifecycle_version = '2.1.0'
ext.material_version = '1.0.0'
ext.mockito_version = '2.18.3'
ext.moshi_version = '1.8.0'
ext.okhttp3_version = '4.1.0'
ext.realm_version = '6.0.2'//'5.8.0'
ext.realm_version = '5.8.0'
ext.realm_adapters_version = '3.1.0'
ext.rxandroid_version = '2.0.1'
ext.rxdogtag_version = '0.2.0'
......@@ -42,12 +42,11 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:7.1.1'
classpath 'com.android.tools.build:gradle:3.5.4'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
classpath 'com.google.gms:google-services:4.2.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "io.realm:realm-gradle-plugin:$realm_version"
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
}
}
......
......@@ -42,10 +42,6 @@ android {
withAnalytics { dimension "analytics" }
noAnalytics { dimension "analytics" }
}
kotlinOptions {
jvmTarget = "11"
}
}
dependencies {
......
......@@ -34,16 +34,6 @@ android {
minSdkVersion 21
targetSdkVersion 29
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
}
}
dependencies {
......
#Thu Mar 17 12:40:57 IST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
......@@ -63,12 +63,12 @@ android {
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility 1.8
targetCompatibility 1.8
}
// For Kotlin projects
kotlinOptions {
jvmTarget = "11"
jvmTarget = "1.8"
}
lintOptions {
......@@ -170,7 +170,6 @@ dependencies {
kapt "io.realm:realm-annotations:$realm_version"
kapt "io.realm:realm-annotations-processor:$realm_version"
// rxjava
implementation "io.reactivex.rxjava2:rxandroid:$rxandroid_version"
implementation "io.reactivex.rxjava2:rxjava:$rxjava_version"
......
......@@ -37,7 +37,7 @@ class TightTextView @JvmOverloads constructor(
val maxLineWidth = (0 until layout.lineCount)
.map(layout::getLineWidth)
.maxOrNull() ?: 0f
.max() ?: 0f
val width = Math.ceil(maxLineWidth.toDouble()).toInt() + compoundPaddingLeft + compoundPaddingRight
if (width < measuredWidth) {
......
......@@ -64,7 +64,7 @@ class BackupPresenter @Inject constructor(
.distinctUntilChanged()
.switchMap { backupRepo.getBackups() }
.doOnNext { backups -> newState { copy(backups = backups) } }
.map { backups -> backups.map { it.date }.maxOrNull() ?: 0L }
.map { backups -> backups.map { it.date }.max() ?: 0L }
.map { lastBackup ->
when (lastBackup) {
0L -> context.getString(R.string.backup_never)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment