From d86e6861ab3ac0b88ae0e39e988e4360437a31cf Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 11 Jun 2018 23:51:00 -0400 Subject: [PATCH] Update to API 28 --- build.gradle | 4 ++-- data/build.gradle | 4 ++-- domain/build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- presentation/build.gradle | 6 +++--- .../feature/conversations/ConversationItemTouchCallback.kt | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index c26c2ad6..e83a1c7a 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { ext.rxjava_version = '2.1.4' ext.rxkotlin_version = '2.1.0' ext.rx_preferences_version = '2.0.0-RC3' - ext.support_version = '27.1.0' + ext.support_version = '28.0.0-alpha1' ext.timber_version = '4.5.1' ext.abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2] @@ -29,7 +29,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.2.0-alpha18' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "io.realm:realm-gradle-plugin:4.3.1" } diff --git a/data/build.gradle b/data/build.gradle index e58f1548..73d40b18 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -3,11 +3,11 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { minSdkVersion 21 - targetSdkVersion 27 + targetSdkVersion 28 } } diff --git a/domain/build.gradle b/domain/build.gradle index e14e4f62..5980de43 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -4,11 +4,11 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { minSdkVersion 21 - targetSdkVersion 27 + targetSdkVersion 28 } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index efc0f067..3c233b25 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Mar 27 18:57:37 EDT 2018 +#Mon Jun 11 23:33:26 EDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/presentation/build.gradle b/presentation/build.gradle index 170c67d2..e56ce245 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -5,14 +5,14 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 27 - buildToolsVersion "27.0.3" + compileSdkVersion 28 + buildToolsVersion "28.0.0" flavorDimensions "analytics" defaultConfig { applicationId "com.moez.QKSMS" minSdkVersion 21 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 173 versionName "3.3.2" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt b/presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt index fd6e0a87..69e3aa03 100644 --- a/presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt +++ b/presentation/src/main/java/feature/conversations/ConversationItemTouchCallback.kt @@ -55,11 +55,11 @@ class ConversationItemTouchCallback @Inject constructor(private val context: Con .toBitmap(iconLength, iconLength) } - override fun onMove(recyclerView: RecyclerView?, viewHolder: RecyclerView.ViewHolder?, target: RecyclerView.ViewHolder?): Boolean { + override fun onMove(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean { return false } - override fun onChildDraw(c: Canvas, recyclerView: RecyclerView?, viewHolder: RecyclerView.ViewHolder, dX: Float, dY: Float, actionState: Int, isCurrentlyActive: Boolean) { + override fun onChildDraw(c: Canvas, recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, dX: Float, dY: Float, actionState: Int, isCurrentlyActive: Boolean) { if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) { val itemView = viewHolder.itemView