From d4a9eb14f2463e89ce54706f566eab45c9bb39e5 Mon Sep 17 00:00:00 2001 From: Guillot Tony Date: Wed, 10 May 2023 01:50:02 +0200 Subject: [PATCH] Upgraded project dependencies --- android-smsmms/build.gradle | 9 ++++----- android-smsmms/src/main/AndroidManifest.xml | 10 +++++++--- build.gradle | 8 ++++---- common/build.gradle | 1 + common/src/main/AndroidManifest.xml | 2 +- .../QKSMS/common/util/extensions/ContextExtensions.kt | 4 +++- data/build.gradle | 1 + data/src/main/AndroidManifest.xml | 2 +- domain/build.gradle | 1 + domain/src/main/AndroidManifest.xml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- presentation/build.gradle | 8 ++++---- presentation/src/main/AndroidManifest.xml | 3 +-- .../java/com/moez/QKSMS/common/widget/TightTextView.kt | 7 +++---- .../com/moez/QKSMS/feature/backup/BackupPresenter.kt | 2 +- .../feature/plus/experiment/UpgradeButtonExperiment.kt | 2 +- 16 files changed, 35 insertions(+), 29 deletions(-) diff --git a/android-smsmms/build.gradle b/android-smsmms/build.gradle index 505404cb3..673ead30d 100644 --- a/android-smsmms/build.gradle +++ b/android-smsmms/build.gradle @@ -25,15 +25,14 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 25 - versionCode 1 - versionName "1.0" } - lintOptions { - abortOnError false - } useLibrary 'org.apache.http.legacy' + namespace 'com.klinker.android.send_message' + lint { + abortOnError false + } } dependencies { diff --git a/android-smsmms/src/main/AndroidManifest.xml b/android-smsmms/src/main/AndroidManifest.xml index c87baa9a5..9cfdcee78 100755 --- a/android-smsmms/src/main/AndroidManifest.xml +++ b/android-smsmms/src/main/AndroidManifest.xml @@ -1,7 +1,11 @@ - + + + + + + + diff --git a/build.gradle b/build.gradle index f7a1e2c8f..1191b05bb 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { ext.exoplayer_version = "2.8.1" ext.glide_version = "4.8.0" ext.junit_version = '4.12' - ext.kotlin_version = '1.3.60' + ext.kotlin_version = '1.6.21' ext.lifecycle_version = '2.1.0' ext.material_version = '1.0.0' ext.mockito_version = '2.18.3' @@ -42,9 +42,9 @@ buildscript { } dependencies { - 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 'com.android.tools.build:gradle:7.4.2' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2' + classpath 'com.google.gms:google-services:4.3.10' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "io.realm:realm-gradle-plugin:$realm_version" } diff --git a/common/build.gradle b/common/build.gradle index a893d1c18..3f8be346c 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -28,6 +28,7 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + namespace 'com.moez.QKSMS.common' } dependencies { diff --git a/common/src/main/AndroidManifest.xml b/common/src/main/AndroidManifest.xml index 969a751c5..21edd1fd3 100644 --- a/common/src/main/AndroidManifest.xml +++ b/common/src/main/AndroidManifest.xml @@ -16,4 +16,4 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - + diff --git a/common/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt b/common/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt index f5534a9fc..256c7cdca 100644 --- a/common/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt +++ b/common/src/main/java/com/moez/QKSMS/common/util/extensions/ContextExtensions.kt @@ -20,6 +20,7 @@ package com.moez.QKSMS.common.util.extensions import android.app.job.JobScheduler import android.content.Context +import android.content.pm.PackageInfo import android.content.res.ColorStateList import android.graphics.Color import android.util.TypedValue @@ -27,6 +28,7 @@ import android.widget.Toast import androidx.annotation.StringRes import androidx.core.content.ContextCompat import androidx.core.content.getSystemService +import androidx.core.content.pm.PackageInfoCompat import com.moez.QKSMS.util.tryOrNull fun Context.getColorCompat(colorRes: Int): Int { @@ -85,7 +87,7 @@ fun Context.isInstalled(packageName: String): Boolean { } val Context.versionCode: Int - get() = packageManager.getPackageInfo(packageName, 0).versionCode + get() = PackageInfoCompat.getLongVersionCode(PackageInfo()).toInt() val Context.jobScheduler: JobScheduler get() = getSystemService()!! diff --git a/data/build.gradle b/data/build.gradle index a76aff2b4..74ac944cb 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -42,6 +42,7 @@ android { withAnalytics { dimension "analytics" } noAnalytics { dimension "analytics" } } + namespace 'com.moez.QKSMS.data' } dependencies { diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml index 3c6184a70..21edd1fd3 100644 --- a/data/src/main/AndroidManifest.xml +++ b/data/src/main/AndroidManifest.xml @@ -16,4 +16,4 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - + diff --git a/domain/build.gradle b/domain/build.gradle index 85a69fd8d..6cb92629f 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -34,6 +34,7 @@ android { minSdkVersion 21 targetSdkVersion 29 } + namespace 'com.moez.QKSMS.domain' } dependencies { diff --git a/domain/src/main/AndroidManifest.xml b/domain/src/main/AndroidManifest.xml index 00485b51a..21edd1fd3 100644 --- a/domain/src/main/AndroidManifest.xml +++ b/domain/src/main/AndroidManifest.xml @@ -16,4 +16,4 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4b9cec46b..0299a449a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/presentation/build.gradle b/presentation/build.gradle index 7dee8d3c8..10734f0b9 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -24,7 +24,6 @@ apply plugin: 'kotlin-kapt' android { compileSdkVersion 29 - buildToolsVersion "29.0.3" flavorDimensions "analytics" defaultConfig { @@ -61,14 +60,15 @@ android { jvmTarget = "1.8" } - lintOptions { - abortOnError false - } productFlavors { withAnalytics { dimension "analytics" } noAnalytics { dimension "analytics" } } + namespace 'com.moez.QKSMS' + lint { + abortOnError false + } if (System.getenv("CI") == "true") { signingConfigs.release.storeFile = file("../keystore") diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml index 796dc6a33..351f1de03 100644 --- a/presentation/src/main/AndroidManifest.xml +++ b/presentation/src/main/AndroidManifest.xml @@ -17,8 +17,7 @@ ~ You should have received a copy of the GNU General Public License ~ along with QKSMS. If not, see . --> - + diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/TightTextView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/TightTextView.kt index 0c104b81c..36d091956 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/TightTextView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/TightTextView.kt @@ -20,6 +20,7 @@ package com.moez.QKSMS.common.widget import android.content.Context import android.util.AttributeSet +import kotlin.math.ceil class TightTextView @JvmOverloads constructor( context: Context, @@ -35,11 +36,9 @@ class TightTextView @JvmOverloads constructor( return } - val maxLineWidth = (0 until layout.lineCount) - .map(layout::getLineWidth) - .max() ?: 0f + val maxLineWidth = (0 until layout.lineCount).maxOfOrNull(layout::getLineWidth) ?: 0f - val width = Math.ceil(maxLineWidth.toDouble()).toInt() + compoundPaddingLeft + compoundPaddingRight + val width = ceil(maxLineWidth.toDouble()).toInt() + compoundPaddingLeft + compoundPaddingRight if (width < measuredWidth) { val widthSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.getMode(widthMeasureSpec)) super.onMeasure(widthSpec, heightMeasureSpec) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt index b547ec306..0a89c0380 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupPresenter.kt @@ -64,7 +64,7 @@ class BackupPresenter @Inject constructor( .distinctUntilChanged() .switchMap { backupRepo.getBackups() } .doOnNext { backups -> newState { copy(backups = backups) } } - .map { backups -> backups.map { it.date }.max() ?: 0L } + .map { backups -> backups.maxOfOrNull { it.date } ?: 0L } .map { lastBackup -> when (lastBackup) { 0L -> context.getString(R.string.backup_never) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt index c954a5592..656ea55b1 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/experiment/UpgradeButtonExperiment.kt @@ -29,7 +29,7 @@ import javax.inject.Inject class UpgradeButtonExperiment @Inject constructor( context: Context, analytics: AnalyticsManager -) : Experiment<@StringRes Int>(context, analytics) { +) : Experiment<@receiver:StringRes Int>(context, analytics) { override val key: String = "Upgrade Button"