Bump gradle to 6.7.1 and paging to alpha13

anirudhnag27 · Feb 5, 2021 · e175b32 · e175b32
1 parent 4c606cc
commit e175b32
Show file tree

Hide file tree

Showing 32 changed files with 52 additions and 267 deletions.
diff --git a/BasicRxJavaSample/gradle/wrapper/gradle-wrapper.properties b/BasicRxJavaSample/gradle/wrapper/gradle-wrapper.properties
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/BasicRxJavaSample/versions.gradle b/BasicRxJavaSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha11"
+versions.paging = "3.0.0-alpha13"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/BasicRxJavaSampleKotlin/gradle/wrapper/gradle-wrapper.properties b/BasicRxJavaSampleKotlin/gradle/wrapper/gradle-wrapper.properties
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/BasicRxJavaSampleKotlin/versions.gradle b/BasicRxJavaSampleKotlin/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha11"
+versions.paging = "3.0.0-alpha13"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/BasicSample/gradle/wrapper/gradle-wrapper.properties b/BasicSample/gradle/wrapper/gradle-wrapper.properties
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/BasicSample/versions.gradle b/BasicSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha11"
+versions.paging = "3.0.0-alpha13"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/GithubBrowserSample/gradle/wrapper/gradle-wrapper.properties b/GithubBrowserSample/gradle/wrapper/gradle-wrapper.properties
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/GithubBrowserSample/versions.gradle b/GithubBrowserSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha11"
+versions.paging = "3.0.0-alpha13"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/LiveDataSample/gradle/wrapper/gradle-wrapper.properties b/LiveDataSample/gradle/wrapper/gradle-wrapper.properties
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/LiveDataSample/versions.gradle b/LiveDataSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha11"
+versions.paging = "3.0.0-alpha13"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/MADSkillsNavigationSample/gradle/wrapper/gradle-wrapper.properties b/MADSkillsNavigationSample/gradle/wrapper/gradle-wrapper.properties
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/MADSkillsNavigationSample/versions.gradle b/MADSkillsNavigationSample/versions.gradle
diff --git a/NavigationAdvancedSample/gradle/wrapper/gradle-wrapper.properties b/NavigationAdvancedSample/gradle/wrapper/gradle-wrapper.properties
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/NavigationAdvancedSample/versions.gradle b/NavigationAdvancedSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha11"
+versions.paging = "3.0.0-alpha13"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/NavigationBasicSample/gradle/wrapper/gradle-wrapper.properties b/NavigationBasicSample/gradle/wrapper/gradle-wrapper.properties
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/NavigationBasicSample/versions.gradle b/NavigationBasicSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha11"
+versions.paging = "3.0.0-alpha13"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/PagingSample/gradle/wrapper/gradle-wrapper.properties b/PagingSample/gradle/wrapper/gradle-wrapper.properties
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/PagingSample/versions.gradle b/PagingSample/versions.gradle
@@ -52,7 +52,7 @@ versions.mockito_android = "2.25.0"
 versions.mockwebserver = "3.8.1"
 versions.navigation = "2.3.0-alpha01"
 versions.okhttp_logging_interceptor = "3.9.0"
-versions.paging = "3.0.0-alpha11"
+versions.paging = "3.0.0-alpha13"
 versions.recyclerview = "1.2.0-beta01"
 versions.retrofit = "2.9.0"
 versions.robolectric = "4.2"

diff --git a/...ing/pagingwithnetwork/reddit/repository/inMemory/byItem/ItemKeyedSubredditPagingSource.kt b/...ing/pagingwithnetwork/reddit/repository/inMemory/byItem/ItemKeyedSubredditPagingSource.kt
@@ -22,6 +22,7 @@ import androidx.paging.PagingSource.LoadParams.Prepend
 import androidx.paging.PagingSource.LoadResult.Page
 import androidx.paging.PagingState
 import com.android.example.paging.pagingwithnetwork.reddit.api.RedditApi
+import com.android.example.paging.pagingwithnetwork.reddit.repository.inMemory.byPage.PageKeyedSubredditPagingSource
 import com.android.example.paging.pagingwithnetwork.reddit.vo.RedditPost
 import retrofit2.HttpException
 import java.io.IOException
@@ -32,26 +33,25 @@ import java.io.IOException
  * Note that this is not the correct consumption of the Reddit API but rather shown here as an
  * alternative implementation which might be more suitable for your backend.
  *
- * @see [com.android.example.paging.pagingwithnetwork.reddit.repository.inMemory.byPage.PageKeyedSubredditPagingSource]
+ * @see [PageKeyedSubredditPagingSource]
  */
 class ItemKeyedSubredditPagingSource(
-        private val redditApi: RedditApi,
-        private val subredditName: String
+    private val redditApi: RedditApi,
+    private val subredditName: String
 ) : PagingSource<String, RedditPost>() {
-
     override suspend fun load(params: LoadParams<String>): LoadResult<String, RedditPost> {
         return try {
             val items = redditApi.getTop(
-                    subreddit = subredditName,
-                    after = if (params is Append) params.key else null,
-                    before = if (params is Prepend) params.key else null,
-                    limit = params.loadSize
+                subreddit = subredditName,
+                after = if (params is Append) params.key else null,
+                before = if (params is Prepend) params.key else null,
+                limit = params.loadSize
             ).data.children.map { it.data }
 
             Page(
-                    data = items,
-                    prevKey = items.firstOrNull()?.name,
-                    nextKey = items.lastOrNull()?.name
+                data = items,
+                prevKey = items.firstOrNull()?.name,
+                nextKey = items.lastOrNull()?.name
             )
         } catch (e: IOException) {
             LoadResult.Error(e)