Fix the bindables module to use library

skydoves · Nov 6, 2024 · cffabe0 · cffabe0
1 parent d283658
commit cffabe0
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -21,6 +21,7 @@ plugins {
   id(libs.plugins.kotlin.android.get().pluginId)
   id(libs.plugins.kotlin.parcelize.get().pluginId)
   id(libs.plugins.kotlin.kapt.get().pluginId)
+  id(libs.plugins.ksp.get().pluginId)
   id(libs.plugins.hilt.plugin.get().pluginId)
 }
 
@@ -56,7 +57,7 @@ dependencies {
   implementation(libs.androidx.appcompat)
   implementation(libs.androidx.activity)
   implementation(libs.androidx.constraintlayout)
-  kapt(libs.hilt.compiler)
+  ksp(libs.hilt.compiler)
 
   implementation(libs.androidx.material)
   implementation(libs.androidx.fragment)

diff --git a/app/src/main/kotlin/com/skydoves/bindablesdemo/MainActivity.kt b/app/src/main/kotlin/com/skydoves/bindablesdemo/MainActivity.kt
@@ -47,7 +47,7 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main
           ) = Unit
 
           override fun onPageSelected(position: Int) {
-            binding.mainBottomNavigation.menu.findItem(position).isChecked = true
+            binding.mainBottomNavigation.menu.getItem(position).isChecked = true
           }
         },
       )

diff --git a/app/src/main/kotlin/com/skydoves/bindablesdemo/recycler/PosterDiffUtil.kt b/app/src/main/kotlin/com/skydoves/bindablesdemo/recycler/PosterDiffUtil.kt
@@ -16,13 +16,17 @@
 
 package com.skydoves.bindablesdemo.recycler
 
+import android.annotation.SuppressLint
 import androidx.recyclerview.widget.DiffUtil
 
 class PosterDiffUtil<T> : DiffUtil.ItemCallback<T>() {
 
-  override fun areItemsTheSame(oldItem: T, newItem: T): Boolean =
-    oldItem.hashCode() == newItem.hashCode()
+  override fun areItemsTheSame(oldItem: T & Any, newItem: T & Any): Boolean {
+    return oldItem.hashCode() == newItem.hashCode()
+  }
 
-  override fun areContentsTheSame(oldItem: T, newItem: T): Boolean =
-    oldItem.hashCode() == newItem.hashCode()
+  @SuppressLint("DiffUtilEquals")
+  override fun areContentsTheSame(oldItem: T & Any, newItem: T & Any): Boolean {
+    return oldItem == newItem
+  }
 }
diff --git a/bindables/api/bindables.api b/bindables/api/bindables.api
@@ -1,18 +1,15 @@
-public class androidx/databinding/DataBinderMapperImpl : androidx/databinding/MergedDataBinderMapper {
-}
-
 public abstract interface class androidx/databinding/DataBindingComponent {
 }
 
 public class androidx/databinding/library/baseAdapters/BR {
-	public static final field _all I
-	public static final field submitted I
+	public static field _all I
+	public static field submitted I
 	public fun <init> ()V
 }
 
 public class com/skydoves/bindables/BR {
-	public static final field _all I
-	public static final field submitted I
+	public static field _all I
+	public static field submitted I
 	public fun <init> ()V
 }
 

diff --git a/bindables/build.gradle.kts b/bindables/build.gradle.kts
@@ -17,7 +17,7 @@
 import com.skydoves.bindables.Configuration
 
 plugins {
-  id(libs.plugins.android.application.get().pluginId)
+  id(libs.plugins.android.library.get().pluginId)
   id(libs.plugins.kotlin.android.get().pluginId)
   id(libs.plugins.kotlin.kapt.get().pluginId)
   id(libs.plugins.kotlin.parcelize.get().pluginId)

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -23,7 +23,7 @@ plugins {
   alias(libs.plugins.kotlin.binary.compatibility) apply false
   alias(libs.plugins.hilt.plugin) apply false
   alias(libs.plugins.nexus.plugin) apply false
-  alias(libs.plugins.kotlin.kapt)
+  alias(libs.plugins.kotlin.kapt) apply false
   alias(libs.plugins.spotless)
   alias(libs.plugins.dokka)
 }