Merge pull request #14 from Semper-Viventem/develop

Update to support 28
Semper-Viventem · Aug 17, 2018 · fc65a8b · fc65a8b
2 parents ce889a7 + 292833b
commit fc65a8b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/backdrop/build.gradle b/backdrop/build.gradle
@@ -37,11 +37,11 @@ subprojects {
 
 android {
 
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 27
+        targetSdkVersion 28
     }
 
     buildTypes {
@@ -57,8 +57,8 @@ android {
 }
 
 ext {
-    supportVersion = '27.1.1'
-    kotlin_version = '1.2.41'
+    supportVersion = '28.0.0-rc01'
+    kotlin_version = '1.2.50'
 }
 
 dependencies {

diff --git a/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt b/backdrop/src/main/kotlin/ru/semper_viventem/backdrop/BackdropBehavior.kt
@@ -48,13 +48,13 @@ class BackdropBehavior : CoordinatorLayout.Behavior<View> {
 
     constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
 
-    override fun onSaveInstanceState(parent: CoordinatorLayout?, child: View?): Parcelable {
+    override fun onSaveInstanceState(parent: CoordinatorLayout, child: View): Parcelable {
         return Bundle().apply {
             putSerializable(ARG_DROP_STATE, dropState)
         }
     }
 
-    override fun onRestoreInstanceState(parent: CoordinatorLayout?, child: View?, state: Parcelable?) {
+    override fun onRestoreInstanceState(parent: CoordinatorLayout, child: View, state: Parcelable) {
         super.onRestoreInstanceState(parent, child, state)
 
             dropState = (state as? Bundle)?.getSerializable(ARG_DROP_STATE) as? DropState ?: DEFAULT_DROP_STATE

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'kotlin-kapt'
 
 android {
 
-    compileSdkVersion 'android-P'
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "ru.semper_viventem.backdropview"