From bbecd69ad9b24a43283f63b9872abb3efd4705ee Mon Sep 17 00:00:00 2001 From: moezbhatti Date: Sat, 17 Nov 2018 18:06:30 -0500 Subject: [PATCH] Upgrade gradle and kotlin versions --- android-smsmms/build.gradle | 2 +- build.gradle | 9 ++++----- common/build.gradle | 2 +- data/build.gradle | 2 +- domain/build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- presentation/build.gradle | 4 ++-- .../com/moez/QKSMS/feature/backup/BackupPresenter.kt | 8 ++++---- .../com/moez/QKSMS/feature/compose/ComposeViewModel.kt | 5 ++--- .../com/moez/QKSMS/feature/settings/SettingsPresenter.kt | 4 ++-- 10 files changed, 20 insertions(+), 22 deletions(-) diff --git a/android-smsmms/build.gradle b/android-smsmms/build.gradle index da9f5235..19a7c393 100644 --- a/android-smsmms/build.gradle +++ b/android-smsmms/build.gradle @@ -37,7 +37,7 @@ android { } dependencies { - implementation "androidx.core:core-ktx:$ktx_version" + implementation "androidx.core:core-ktx:$androidx_version" implementation "com.jakewharton.timber:timber:$timber_version" implementation 'com.klinkerapps:logger:1.0.3' implementation 'com.squareup.okhttp:okhttp:2.5.0' diff --git a/build.gradle b/build.gradle index 62155ff3..142fc938 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.androidx_version = '1.0.0-beta01' + ext.androidx_version = '1.0.0' ext.androidx_testrunner_version = '1.1.0-alpha3' ext.autodispose_version = '0.7.0' ext.conductor_version = '2.1.5' @@ -12,9 +12,8 @@ buildscript { ext.glide_version = "4.8.0-20180619.011009-9" ext.glide_compiler_version = "4.8.0-20180619.011013-9" ext.junit_version = '4.12' - ext.kotlin_version = '1.2.51' - ext.ktx_version = "1.0.0-alpha1" - ext.lifecycle_version = '2.0.0-alpha1' + ext.kotlin_version = '1.3.0' + ext.lifecycle_version = '2.0.0' ext.mockito_version = '2.18.3' ext.moshi_version = '1.6.0' ext.realm_version = '4.3.1' @@ -35,7 +34,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0-alpha06' + classpath 'com.android.tools.build:gradle:3.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "io.realm:realm-gradle-plugin:4.3.1" } diff --git a/common/build.gradle b/common/build.gradle index 38c22c03..b92bac84 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -31,7 +31,7 @@ android { } dependencies { - implementation "androidx.core:core-ktx:$ktx_version" + implementation "androidx.core:core-ktx:$androidx_version" implementation "com.jakewharton.timber:timber:$timber_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" diff --git a/data/build.gradle b/data/build.gradle index 489e1428..1f7d91ff 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -44,6 +44,7 @@ dependencies { // androidx implementation "androidx.appcompat:appcompat:$androidx_version" + implementation "androidx.core:core-ktx:$androidx_version" implementation "androidx.exifinterface:exifinterface:$androidx_version" // glide @@ -71,7 +72,6 @@ dependencies { testImplementation "junit:junit:$junit_version" testImplementation "org.mockito:mockito-core:$mockito_version" - implementation "androidx.core:core-ktx:$ktx_version" implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version" implementation "com.jakewharton.timber:timber:$timber_version" implementation "com.squareup.moshi:moshi:$moshi_version" diff --git a/domain/build.gradle b/domain/build.gradle index d18412d9..7cdaf067 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -46,7 +46,7 @@ dependencies { implementation "io.reactivex.rxjava2:rxjava:$rxjava_version" implementation "io.reactivex.rxjava2:rxkotlin:$rxkotlin_version" - implementation "androidx.core:core-ktx:$ktx_version" + implementation "androidx.core:core-ktx:$androidx_version" implementation "com.jakewharton.timber:timber:$timber_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation project(":common") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 99298d85..57884974 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Aug 21 23:23:34 EDT 2018 +#Sat Nov 17 17:39:22 EST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/presentation/build.gradle b/presentation/build.gradle index 52416e73..5477ad24 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -24,7 +24,7 @@ apply plugin: 'kotlin-kapt' android { compileSdkVersion 28 - buildToolsVersion "28.0.0" + buildToolsVersion "28.0.3" flavorDimensions "analytics" defaultConfig { @@ -112,6 +112,7 @@ dependencies { // androidx implementation "androidx.appcompat:appcompat:$androidx_version" implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version" + implementation "androidx.core:core-ktx:$androidx_version" implementation "com.google.android.material:material:$androidx_version" implementation "androidx.emoji:emoji-appcompat:$androidx_version" @@ -173,7 +174,6 @@ dependencies { testImplementation "junit:junit:$junit_version" testImplementation "org.mockito:mockito-core:$mockito_version" - implementation "androidx.core:core-ktx:$ktx_version" implementation "com.android.billingclient:billing:1.0" implementation "com.bugsnag:bugsnag-android:4.1.1" implementation "com.github.chrisbanes:PhotoView:2.0.0" 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 d8faab78..80cf96f6 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 @@ -19,12 +19,12 @@ package com.moez.QKSMS.feature.backup import android.content.Context -import androidx.core.widget.toast import com.moez.QKSMS.R import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.base.QkPresenter import com.moez.QKSMS.common.util.BillingManager import com.moez.QKSMS.common.util.DateFormatter +import com.moez.QKSMS.common.util.extensions.makeToast import com.moez.QKSMS.interactor.PerformBackup import com.moez.QKSMS.manager.PermissionManager import com.moez.QKSMS.repository.BackupRepository @@ -92,9 +92,9 @@ class BackupPresenter @Inject constructor( billingManager.upgradeStatus) { _, backupProgress, restoreProgress, upgraded -> when { - !upgraded -> context.toast(R.string.backup_restore_error_plus) - backupProgress.running -> context.toast(R.string.backup_restore_error_backup) - restoreProgress.running -> context.toast(R.string.backup_restore_error_restore) + !upgraded -> context.makeToast(R.string.backup_restore_error_plus) + backupProgress.running -> context.makeToast(R.string.backup_restore_error_backup) + restoreProgress.running -> context.makeToast(R.string.backup_restore_error_restore) !permissionManager.hasStorage() -> view.requestStoragePermission() else -> view.selectFile() } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt index db8962e6..f5ab5442 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt @@ -22,7 +22,6 @@ import android.content.Context import android.telephony.PhoneNumberUtils import android.telephony.SmsMessage import android.view.inputmethod.EditorInfo -import androidx.core.widget.toast import com.moez.QKSMS.R import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.androidxcompat.scope @@ -503,7 +502,7 @@ class ComposeViewModel @Inject constructor( view.scheduleSelectedIntent .filter { scheduled -> (scheduled > System.currentTimeMillis()).also { future -> - if (!future) context.toast(R.string.compose_scheduled_future) + if (!future) context.makeToast(R.string.compose_scheduled_future) } } .autoDisposable(view.scope()) @@ -607,7 +606,7 @@ class ComposeViewModel @Inject constructor( val uris = attachments.map { it.getUri() }.map { it.toString() } val params = AddScheduledMessage.Params(state.scheduled, subId, addresses, state.sendAsGroup, body, uris) addScheduledMessage.execute(params) - context.toast(R.string.compose_scheduled_toast) + context.makeToast(R.string.compose_scheduled_toast) } state.sendAsGroup -> { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt index bc0a3b0b..76c4ea1c 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsPresenter.kt @@ -19,13 +19,13 @@ package com.moez.QKSMS.feature.settings import android.content.Context -import androidx.core.widget.toast import com.moez.QKSMS.R import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.base.QkPresenter import com.moez.QKSMS.common.util.BillingManager import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.common.util.DateFormatter +import com.moez.QKSMS.common.util.extensions.makeToast import com.moez.QKSMS.interactor.SyncMessages import com.moez.QKSMS.repository.SyncRepository import com.moez.QKSMS.util.NightModeManager @@ -174,7 +174,7 @@ class SettingsPresenter @Inject constructor( .doOnNext { enabled -> prefs.logging.set(enabled) } .autoDisposable(view.scope()) .subscribe { enabled -> - context.toast(when (enabled) { + context.makeToast(when (enabled) { true -> R.string.settings_logging_enabled false -> R.string.settings_logging_disabled })