From 96e14a88fa50a328bbc67aa58cfa1cd0f5b36c09 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 12 Dec 2022 15:39:25 -0500 Subject: [PATCH] Upgrade to Kotlin v1.7.20 --- android-smsmms/build.gradle | 9 ++++----- android-smsmms/src/main/AndroidManifest.xml | 4 +--- build.gradle | 8 ++++---- common/build.gradle | 1 + common/src/main/AndroidManifest.xml | 2 +- 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 | 7 ++++--- presentation/src/main/AndroidManifest.xml | 3 +-- .../java/com/moez/QKSMS/feature/main/MainViewModel.kt | 2 ++ .../feature/plus/experiment/UpgradeButtonExperiment.kt | 2 +- 14 files changed, 24 insertions(+), 22 deletions(-) diff --git a/android-smsmms/build.gradle b/android-smsmms/build.gradle index 505404cb..d49b9a3d 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' + lint { + abortOnError false + } + namespace 'com.klinker.android.send_message' } dependencies { diff --git a/android-smsmms/src/main/AndroidManifest.xml b/android-smsmms/src/main/AndroidManifest.xml index c87baa9a..3af6653c 100755 --- a/android-smsmms/src/main/AndroidManifest.xml +++ b/android-smsmms/src/main/AndroidManifest.xml @@ -1,7 +1,5 @@ - + diff --git a/build.gradle b/build.gradle index 17dbcf73..6d44edf8 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.7.20' 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:4.2.2' - 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.3.1' + 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 a893d1c1..3f8be346 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 969a751c..21edd1fd 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/data/build.gradle b/data/build.gradle index a76aff2b..74ac944c 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 3c6184a7..21edd1fd 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 85a69fd8..6cb92629 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 00485b51..21edd1fd 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 5f143146..345d3af5 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-6.7.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/presentation/build.gradle b/presentation/build.gradle index 46a92ca4..28deafaa 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -60,14 +60,15 @@ android { jvmTarget = "1.8" } - lintOptions { - abortOnError false - } productFlavors { withAnalytics { dimension "analytics" } noAnalytics { dimension "analytics" } } + lint { + abortOnError false + } + namespace 'com.moez.QKSMS' 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 d52d0503..fbf57dea 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/feature/main/MainViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt index e4fec32b..a285c432 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainViewModel.kt @@ -408,6 +408,8 @@ class MainViewModel @Inject constructor( val page = state.page.copy(addContact = add, markPinned = pin, markRead = read, selected = selected) newState { copy(page = page) } } + + is Searching -> {} // Ignore } } .autoDisposable(view.scope()) 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 c954a559..e5727c0c 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(context, analytics) { override val key: String = "Upgrade Button"