diff --git a/build.gradle b/build.gradle index f00d284d..b3e695f0 100644 --- a/build.gradle +++ b/build.gradle @@ -8,8 +8,8 @@ buildscript { ext.exoplayer_version = "2.8.1" ext.glide_version = "4.8.0-20180619.011009-9" ext.glide_compiler_version = "4.8.0-20180619.011013-9" - ext.kotlin_version = '1.2.31' - ext.ktx_version = "0.2" + ext.kotlin_version = '1.2.50' + ext.ktx_version = "1.0.0-alpha1" ext.lifecycle_version = '2.0.0-alpha1' ext.mockito_version = '2.18.3' ext.realm_version = '4.3.1' diff --git a/data/src/main/java/com/moez/QKSMS/manager/ExternalBlockingManagerImpl.kt b/data/src/main/java/com/moez/QKSMS/manager/ExternalBlockingManagerImpl.kt index 805b88fc..c81f5578 100644 --- a/data/src/main/java/com/moez/QKSMS/manager/ExternalBlockingManagerImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/manager/ExternalBlockingManagerImpl.kt @@ -26,7 +26,7 @@ import android.os.Handler import android.os.IBinder import android.os.Message import android.os.Messenger -import androidx.os.bundleOf +import androidx.core.os.bundleOf import com.moez.QKSMS.util.Preferences import com.moez.QKSMS.util.tryOrNull import io.reactivex.Single diff --git a/domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt b/domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt index 1dfb2c6f..83d39226 100644 --- a/domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt +++ b/domain/src/main/java/com/moez/QKSMS/model/MmsPart.kt @@ -18,7 +18,7 @@ */ package com.moez.QKSMS.model -import androidx.net.toUri +import androidx.core.net.toUri import io.realm.RealmObject import io.realm.RealmResults import io.realm.annotations.LinkingObjects diff --git a/presentation/build.gradle b/presentation/build.gradle index fc67dfe0..a2da032a 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -154,7 +154,7 @@ dependencies { implementation "com.f2prateek.rx.preferences2:rx-preferences:$rx_preferences_version" implementation "com.google.android:flexbox:0.3.1" implementation "com.jakewharton.timber:timber:$timber_version" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation project(":android-smsmms") implementation project(':data') implementation project(':domain') diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt index 4cfcf31c..5d802ee0 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationItemTouchCallback.kt @@ -22,7 +22,7 @@ import android.content.Context import android.graphics.Bitmap import android.graphics.Canvas import android.graphics.Paint -import androidx.graphics.drawable.toBitmap +import androidx.core.graphics.drawable.toBitmap import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.RecyclerView import com.moez.QKSMS.R