From 08f8bbcc13bcd3b9cc8e2464c7cc528002d037ae Mon Sep 17 00:00:00 2001 From: Matthieu <24-artectrex@users.noreply.shinice.net> Date: Sat, 19 Dec 2020 21:12:56 +0100 Subject: [PATCH] Update dependencies --- app/build.gradle | 14 +++++++------- .../feeds/cachedFeeds/CachedFeedFragment.kt | 1 + .../feeds/cachedFeeds/FeedContentRepository.kt | 1 + .../fragments/feeds/cachedFeeds/FeedViewModel.kt | 1 + build.gradle | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5088fefa..b1efe33c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -79,7 +79,7 @@ dependencies { implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" implementation 'androidx.navigation:navigation-fragment-ktx:2.3.2' implementation 'androidx.navigation:navigation-ui-ktx:2.3.2' - implementation 'androidx.paging:paging-runtime-ktx:3.0.0-alpha10' + implementation 'androidx.paging:paging-runtime-ktx:3.0.0-alpha11' implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0' implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0' implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0" @@ -87,16 +87,16 @@ dependencies { implementation 'androidx.gridlayout:gridlayout:1.0.0' // Use the most recent version of CameraX - def camerax_version = '1.0.0-beta12' - implementation "androidx.camera:camera-core:${camerax_version}" - implementation "androidx.camera:camera-camera2:${camerax_version}" + def cameraX_version = '1.0.0-rc01' + implementation "androidx.camera:camera-core:${cameraX_version}" + implementation "androidx.camera:camera-camera2:${cameraX_version}" // CameraX Lifecycle library - implementation "androidx.camera:camera-lifecycle:$camerax_version" + implementation "androidx.camera:camera-lifecycle:$cameraX_version" // CameraX View class - implementation 'androidx.camera:camera-view:1.0.0-alpha19' + implementation 'androidx.camera:camera-view:1.0.0-alpha20' - def room_version = "2.3.0-alpha03" + def room_version = "2.3.0-alpha04" implementation "androidx.room:room-runtime:$room_version" kapt "androidx.room:room-compiler:$room_version" implementation "androidx.room:room-ktx:$room_version" diff --git a/app/src/main/java/com/h/pixeldroid/fragments/feeds/cachedFeeds/CachedFeedFragment.kt b/app/src/main/java/com/h/pixeldroid/fragments/feeds/cachedFeeds/CachedFeedFragment.kt index 13e76fec..135b3fb5 100644 --- a/app/src/main/java/com/h/pixeldroid/fragments/feeds/cachedFeeds/CachedFeedFragment.kt +++ b/app/src/main/java/com/h/pixeldroid/fragments/feeds/cachedFeeds/CachedFeedFragment.kt @@ -38,6 +38,7 @@ open class CachedFeedFragment : BaseFragment() { private var job: Job? = null + @ExperimentalPagingApi internal fun launch() { // Make sure we cancel the previous job before creating a new one job?.cancel() diff --git a/app/src/main/java/com/h/pixeldroid/fragments/feeds/cachedFeeds/FeedContentRepository.kt b/app/src/main/java/com/h/pixeldroid/fragments/feeds/cachedFeeds/FeedContentRepository.kt index 32acabaa..6ed1c724 100644 --- a/app/src/main/java/com/h/pixeldroid/fragments/feeds/cachedFeeds/FeedContentRepository.kt +++ b/app/src/main/java/com/h/pixeldroid/fragments/feeds/cachedFeeds/FeedContentRepository.kt @@ -37,6 +37,7 @@ class FeedContentRepository @ExperimentalPagingApi * [FeedContentDatabase], exposed as a stream of data that will emit * every time we get more data from the network. */ + @ExperimentalPagingApi fun stream(): Flow> { val pagingSourceFactory = { diff --git a/app/src/main/java/com/h/pixeldroid/fragments/feeds/cachedFeeds/FeedViewModel.kt b/app/src/main/java/com/h/pixeldroid/fragments/feeds/cachedFeeds/FeedViewModel.kt index b8bc9775..8e3c5c4f 100644 --- a/app/src/main/java/com/h/pixeldroid/fragments/feeds/cachedFeeds/FeedViewModel.kt +++ b/app/src/main/java/com/h/pixeldroid/fragments/feeds/cachedFeeds/FeedViewModel.kt @@ -30,6 +30,7 @@ class FeedViewModel(private val repository: FeedContentR private var currentResult: Flow>? = null + @ExperimentalPagingApi fun flow(): Flow> { val lastResult = currentResult if (lastResult != null) { diff --git a/build.gradle b/build.gradle index ea4a068f..1b6312c6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.4.20' + ext.kotlin_version = '1.4.21' repositories { google() jcenter()