Upgrade kotlin version & gradle dependencies.

sharmadhiraj · sharmadhiraj · commit 08ddc7baeb2d · 2023-12-06T20:21:20.000+05:45
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,6 +19,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide'
 }
 
 dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
diff --git a/app/src/main/java/com/sharmadhiraj/androidpaginglibrarystepbystepimplementationguide/adapter/ListFooterViewHolder.kt b/app/src/main/java/com/sharmadhiraj/androidpaginglibrarystepbystepimplementationguide/adapter/ListFooterViewHolder.kt
@@ -10,7 +10,8 @@ import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.R
 import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.State
 import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.State.ERROR
 import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.State.LOADING
-import kotlinx.android.synthetic.main.item_list_footer.view.*
+import kotlinx.android.synthetic.main.item_list_footer.view.progress_bar
+import kotlinx.android.synthetic.main.item_list_footer.view.txt_error
 
 class ListFooterViewHolder(view: View) : RecyclerView.ViewHolder(view) {
 
diff --git a/app/src/main/java/com/sharmadhiraj/androidpaginglibrarystepbystepimplementationguide/adapter/NewsListAdapter.kt b/app/src/main/java/com/sharmadhiraj/androidpaginglibrarystepbystepimplementationguide/adapter/NewsListAdapter.kt
@@ -1,14 +1,14 @@
 package com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.adapter
 
 import android.view.ViewGroup
-import androidx.paging.PagedListAdapter
+import androidx.paging.PagingDataAdapter
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.News
 import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.State
 
-class NewsListAdapter(private val retry: () -> Unit)
-    : PagedListAdapter<News, RecyclerView.ViewHolder>(NewsDiffCallback) {
+class NewsListAdapter(private val retry: () -> Unit) :
+    PagingDataAdapter<News, RecyclerView.ViewHolder>(NewsDiffCallback) {
 
     private val DATA_VIEW_TYPE = 1
     private val FOOTER_VIEW_TYPE = 2
diff --git a/app/src/main/java/com/sharmadhiraj/androidpaginglibrarystepbystepimplementationguide/adapter/NewsViewHolder.kt b/app/src/main/java/com/sharmadhiraj/androidpaginglibrarystepbystepimplementationguide/adapter/NewsViewHolder.kt
@@ -7,7 +7,8 @@ import androidx.recyclerview.widget.RecyclerView
 import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.R
 import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.News
 import com.squareup.picasso.Picasso
-import kotlinx.android.synthetic.main.item_news.view.*
+import kotlinx.android.synthetic.main.item_news.view.img_news_banner
+import kotlinx.android.synthetic.main.item_news.view.txt_news_name
 
 class NewsViewHolder(view: View) : RecyclerView.ViewHolder(view) {
 
diff --git a/app/src/main/java/com/sharmadhiraj/androidpaginglibrarystepbystepimplementationguide/data/NewsDataSource.kt b/app/src/main/java/com/sharmadhiraj/androidpaginglibrarystepbystepimplementationguide/data/NewsDataSource.kt
@@ -1,7 +1,7 @@
 package com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data
 
 import androidx.lifecycle.MutableLiveData
-import androidx.paging.PageKeyedDataSource
+import androidx.paging.PagingSource
 import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.State.DONE
 import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.State.ERROR
 import io.reactivex.Completable
@@ -13,7 +13,7 @@ import io.reactivex.schedulers.Schedulers
 class NewsDataSource(
     private val networkService: NetworkService,
     private val compositeDisposable: CompositeDisposable
-) : PageKeyedDataSource<Int, News>() {
+) : PagingSource<Int, News>() {
 
     var state: MutableLiveData<State> = MutableLiveData()
     private var retryCompletable: Completable? = null
diff --git a/app/src/main/java/com/sharmadhiraj/androidpaginglibrarystepbystepimplementationguide/viewModel/NewsListViewModel.kt b/app/src/main/java/com/sharmadhiraj/androidpaginglibrarystepbystepimplementationguide/viewModel/NewsListViewModel.kt
@@ -3,10 +3,17 @@ package com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.viewM
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Transformations
 import androidx.lifecycle.ViewModel
-import androidx.paging.LivePagedListBuilder
 import androidx.paging.PagedList
-import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.*
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import androidx.paging.liveData
+import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.NetworkService
+import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.News
+import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.NewsDataSource
+import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.NewsDataSourceFactory
+import com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide.data.State
 import io.reactivex.disposables.CompositeDisposable
+import kotlinx.coroutines.Dispatchers
 
 class NewsListViewModel : ViewModel() {
 
@@ -23,7 +30,17 @@ class NewsListViewModel : ViewModel() {
             .setInitialLoadSizeHint(pageSize * 2)
             .setEnablePlaceholders(false)
             .build()
-        newsList = LivePagedListBuilder(newsDataSourceFactory, config).build()
+        newsList = Pager<Int, News>(
+            PagingConfig(
+                config.pageSize,
+                config.prefetchDistance,
+                config.enablePlaceholders,
+                config.initialLoadSizeHint,
+                config.maxSize
+            ),
+            this.initialLoadKey,
+            newsDataSourceFactory.asPagingSourceFactory(Dispatchers.IO)
+        ).liveData.build()
     }
 
 
diff --git a/build.gradle b/build.gradle
@@ -1,11 +1,11 @@
 buildscript {
-    ext.kotlin_version = '1.5.0'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Tue May 05 14:03:24 NPT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ android {`
`19`	`19`	`proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
`20`	`20`	`}`
`21`	`21`	`}`
	`22`	`+ namespace 'com.sharmadhiraj.androidpaginglibrarystepbystepimplementationguide'`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`buildscript {`
`2`		`- ext.kotlin_version = '1.5.0'`
	`2`	`+ ext.kotlin_version = '1.7.10'`
`3`	`3`	`repositories {`
`4`	`4`	`google()`
`5`	`5`	`mavenCentral()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:4.2.1'`
	`8`	`+ classpath 'com.android.tools.build:gradle:7.4.2'`
`9`	`9`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`10`	`10`	`}`
`11`	`11`	`}`