forked from upstream-mirrors/quik
Upgrade gradle and kotlin versions
This commit is contained in:
@@ -37,7 +37,7 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation "androidx.core:core-ktx:$ktx_version"
|
implementation "androidx.core:core-ktx:$androidx_version"
|
||||||
implementation "com.jakewharton.timber:timber:$timber_version"
|
implementation "com.jakewharton.timber:timber:$timber_version"
|
||||||
implementation 'com.klinkerapps:logger:1.0.3'
|
implementation 'com.klinkerapps:logger:1.0.3'
|
||||||
implementation 'com.squareup.okhttp:okhttp:2.5.0'
|
implementation 'com.squareup.okhttp:okhttp:2.5.0'
|
||||||
|
|||||||
+4
-5
@@ -1,7 +1,7 @@
|
|||||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
ext.androidx_version = '1.0.0-beta01'
|
ext.androidx_version = '1.0.0'
|
||||||
ext.androidx_testrunner_version = '1.1.0-alpha3'
|
ext.androidx_testrunner_version = '1.1.0-alpha3'
|
||||||
ext.autodispose_version = '0.7.0'
|
ext.autodispose_version = '0.7.0'
|
||||||
ext.conductor_version = '2.1.5'
|
ext.conductor_version = '2.1.5'
|
||||||
@@ -12,9 +12,8 @@ buildscript {
|
|||||||
ext.glide_version = "4.8.0-20180619.011009-9"
|
ext.glide_version = "4.8.0-20180619.011009-9"
|
||||||
ext.glide_compiler_version = "4.8.0-20180619.011013-9"
|
ext.glide_compiler_version = "4.8.0-20180619.011013-9"
|
||||||
ext.junit_version = '4.12'
|
ext.junit_version = '4.12'
|
||||||
ext.kotlin_version = '1.2.51'
|
ext.kotlin_version = '1.3.0'
|
||||||
ext.ktx_version = "1.0.0-alpha1"
|
ext.lifecycle_version = '2.0.0'
|
||||||
ext.lifecycle_version = '2.0.0-alpha1'
|
|
||||||
ext.mockito_version = '2.18.3'
|
ext.mockito_version = '2.18.3'
|
||||||
ext.moshi_version = '1.6.0'
|
ext.moshi_version = '1.6.0'
|
||||||
ext.realm_version = '4.3.1'
|
ext.realm_version = '4.3.1'
|
||||||
@@ -35,7 +34,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
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 "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
classpath "io.realm:realm-gradle-plugin:4.3.1"
|
classpath "io.realm:realm-gradle-plugin:4.3.1"
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -31,7 +31,7 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation "androidx.core:core-ktx:$ktx_version"
|
implementation "androidx.core:core-ktx:$androidx_version"
|
||||||
implementation "com.jakewharton.timber:timber:$timber_version"
|
implementation "com.jakewharton.timber:timber:$timber_version"
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -44,6 +44,7 @@ dependencies {
|
|||||||
|
|
||||||
// androidx
|
// androidx
|
||||||
implementation "androidx.appcompat:appcompat:$androidx_version"
|
implementation "androidx.appcompat:appcompat:$androidx_version"
|
||||||
|
implementation "androidx.core:core-ktx:$androidx_version"
|
||||||
implementation "androidx.exifinterface:exifinterface:$androidx_version"
|
implementation "androidx.exifinterface:exifinterface:$androidx_version"
|
||||||
|
|
||||||
// glide
|
// glide
|
||||||
@@ -71,7 +72,6 @@ dependencies {
|
|||||||
testImplementation "junit:junit:$junit_version"
|
testImplementation "junit:junit:$junit_version"
|
||||||
testImplementation "org.mockito:mockito-core:$mockito_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.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version"
|
||||||
implementation "com.jakewharton.timber:timber:$timber_version"
|
implementation "com.jakewharton.timber:timber:$timber_version"
|
||||||
implementation "com.squareup.moshi:moshi:$moshi_version"
|
implementation "com.squareup.moshi:moshi:$moshi_version"
|
||||||
|
|||||||
+1
-1
@@ -46,7 +46,7 @@ dependencies {
|
|||||||
implementation "io.reactivex.rxjava2:rxjava:$rxjava_version"
|
implementation "io.reactivex.rxjava2:rxjava:$rxjava_version"
|
||||||
implementation "io.reactivex.rxjava2:rxkotlin:$rxkotlin_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 "com.jakewharton.timber:timber:$timber_version"
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
|
||||||
implementation project(":common")
|
implementation project(":common")
|
||||||
|
|||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
#Tue Aug 21 23:23:34 EDT 2018
|
#Sat Nov 17 17:39:22 EST 2018
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
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
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ apply plugin: 'kotlin-kapt'
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 28
|
compileSdkVersion 28
|
||||||
buildToolsVersion "28.0.0"
|
buildToolsVersion "28.0.3"
|
||||||
flavorDimensions "analytics"
|
flavorDimensions "analytics"
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
@@ -112,6 +112,7 @@ dependencies {
|
|||||||
// androidx
|
// androidx
|
||||||
implementation "androidx.appcompat:appcompat:$androidx_version"
|
implementation "androidx.appcompat:appcompat:$androidx_version"
|
||||||
implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
|
implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
|
||||||
|
implementation "androidx.core:core-ktx:$androidx_version"
|
||||||
implementation "com.google.android.material:material:$androidx_version"
|
implementation "com.google.android.material:material:$androidx_version"
|
||||||
implementation "androidx.emoji:emoji-appcompat:$androidx_version"
|
implementation "androidx.emoji:emoji-appcompat:$androidx_version"
|
||||||
|
|
||||||
@@ -173,7 +174,6 @@ dependencies {
|
|||||||
testImplementation "junit:junit:$junit_version"
|
testImplementation "junit:junit:$junit_version"
|
||||||
testImplementation "org.mockito:mockito-core:$mockito_version"
|
testImplementation "org.mockito:mockito-core:$mockito_version"
|
||||||
|
|
||||||
implementation "androidx.core:core-ktx:$ktx_version"
|
|
||||||
implementation "com.android.billingclient:billing:1.0"
|
implementation "com.android.billingclient:billing:1.0"
|
||||||
implementation "com.bugsnag:bugsnag-android:4.1.1"
|
implementation "com.bugsnag:bugsnag-android:4.1.1"
|
||||||
implementation "com.github.chrisbanes:PhotoView:2.0.0"
|
implementation "com.github.chrisbanes:PhotoView:2.0.0"
|
||||||
|
|||||||
@@ -19,12 +19,12 @@
|
|||||||
package com.moez.QKSMS.feature.backup
|
package com.moez.QKSMS.feature.backup
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import androidx.core.widget.toast
|
|
||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
import com.moez.QKSMS.common.Navigator
|
import com.moez.QKSMS.common.Navigator
|
||||||
import com.moez.QKSMS.common.base.QkPresenter
|
import com.moez.QKSMS.common.base.QkPresenter
|
||||||
import com.moez.QKSMS.common.util.BillingManager
|
import com.moez.QKSMS.common.util.BillingManager
|
||||||
import com.moez.QKSMS.common.util.DateFormatter
|
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.interactor.PerformBackup
|
||||||
import com.moez.QKSMS.manager.PermissionManager
|
import com.moez.QKSMS.manager.PermissionManager
|
||||||
import com.moez.QKSMS.repository.BackupRepository
|
import com.moez.QKSMS.repository.BackupRepository
|
||||||
@@ -92,9 +92,9 @@ class BackupPresenter @Inject constructor(
|
|||||||
billingManager.upgradeStatus)
|
billingManager.upgradeStatus)
|
||||||
{ _, backupProgress, restoreProgress, upgraded ->
|
{ _, backupProgress, restoreProgress, upgraded ->
|
||||||
when {
|
when {
|
||||||
!upgraded -> context.toast(R.string.backup_restore_error_plus)
|
!upgraded -> context.makeToast(R.string.backup_restore_error_plus)
|
||||||
backupProgress.running -> context.toast(R.string.backup_restore_error_backup)
|
backupProgress.running -> context.makeToast(R.string.backup_restore_error_backup)
|
||||||
restoreProgress.running -> context.toast(R.string.backup_restore_error_restore)
|
restoreProgress.running -> context.makeToast(R.string.backup_restore_error_restore)
|
||||||
!permissionManager.hasStorage() -> view.requestStoragePermission()
|
!permissionManager.hasStorage() -> view.requestStoragePermission()
|
||||||
else -> view.selectFile()
|
else -> view.selectFile()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ import android.content.Context
|
|||||||
import android.telephony.PhoneNumberUtils
|
import android.telephony.PhoneNumberUtils
|
||||||
import android.telephony.SmsMessage
|
import android.telephony.SmsMessage
|
||||||
import android.view.inputmethod.EditorInfo
|
import android.view.inputmethod.EditorInfo
|
||||||
import androidx.core.widget.toast
|
|
||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
import com.moez.QKSMS.common.Navigator
|
import com.moez.QKSMS.common.Navigator
|
||||||
import com.moez.QKSMS.common.androidxcompat.scope
|
import com.moez.QKSMS.common.androidxcompat.scope
|
||||||
@@ -503,7 +502,7 @@ class ComposeViewModel @Inject constructor(
|
|||||||
view.scheduleSelectedIntent
|
view.scheduleSelectedIntent
|
||||||
.filter { scheduled ->
|
.filter { scheduled ->
|
||||||
(scheduled > System.currentTimeMillis()).also { future ->
|
(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())
|
.autoDisposable(view.scope())
|
||||||
@@ -607,7 +606,7 @@ class ComposeViewModel @Inject constructor(
|
|||||||
val uris = attachments.map { it.getUri() }.map { it.toString() }
|
val uris = attachments.map { it.getUri() }.map { it.toString() }
|
||||||
val params = AddScheduledMessage.Params(state.scheduled, subId, addresses, state.sendAsGroup, body, uris)
|
val params = AddScheduledMessage.Params(state.scheduled, subId, addresses, state.sendAsGroup, body, uris)
|
||||||
addScheduledMessage.execute(params)
|
addScheduledMessage.execute(params)
|
||||||
context.toast(R.string.compose_scheduled_toast)
|
context.makeToast(R.string.compose_scheduled_toast)
|
||||||
}
|
}
|
||||||
|
|
||||||
state.sendAsGroup -> {
|
state.sendAsGroup -> {
|
||||||
|
|||||||
@@ -19,13 +19,13 @@
|
|||||||
package com.moez.QKSMS.feature.settings
|
package com.moez.QKSMS.feature.settings
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import androidx.core.widget.toast
|
|
||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
import com.moez.QKSMS.common.Navigator
|
import com.moez.QKSMS.common.Navigator
|
||||||
import com.moez.QKSMS.common.base.QkPresenter
|
import com.moez.QKSMS.common.base.QkPresenter
|
||||||
import com.moez.QKSMS.common.util.BillingManager
|
import com.moez.QKSMS.common.util.BillingManager
|
||||||
import com.moez.QKSMS.common.util.Colors
|
import com.moez.QKSMS.common.util.Colors
|
||||||
import com.moez.QKSMS.common.util.DateFormatter
|
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.interactor.SyncMessages
|
||||||
import com.moez.QKSMS.repository.SyncRepository
|
import com.moez.QKSMS.repository.SyncRepository
|
||||||
import com.moez.QKSMS.util.NightModeManager
|
import com.moez.QKSMS.util.NightModeManager
|
||||||
@@ -174,7 +174,7 @@ class SettingsPresenter @Inject constructor(
|
|||||||
.doOnNext { enabled -> prefs.logging.set(enabled) }
|
.doOnNext { enabled -> prefs.logging.set(enabled) }
|
||||||
.autoDisposable(view.scope())
|
.autoDisposable(view.scope())
|
||||||
.subscribe { enabled ->
|
.subscribe { enabled ->
|
||||||
context.toast(when (enabled) {
|
context.makeToast(when (enabled) {
|
||||||
true -> R.string.settings_logging_enabled
|
true -> R.string.settings_logging_enabled
|
||||||
false -> R.string.settings_logging_disabled
|
false -> R.string.settings_logging_disabled
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user