diff --git a/app/build.gradle b/app/build.gradle index 8f7e48464..231236e25 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -105,7 +105,7 @@ dependencies { implementation "androidx.appcompat:appcompat:$appcompat_version" implementation 'androidx.annotation:annotation:1.6.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.recyclerview:recyclerview:1.3.0-rc01' implementation "androidx.preference:preference-ktx:$preference_version" implementation "androidx.core:core-ktx:$core_version" implementation 'androidx.palette:palette-ktx:1.0.0' diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt index c201a5278..a9cd101ec 100644 --- a/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt +++ b/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt @@ -16,7 +16,7 @@ package code.name.monkey.retromusic.repository import android.content.Context import androidx.lifecycle.LiveData -import androidx.lifecycle.Transformations +import androidx.lifecycle.map import code.name.monkey.retromusic.* import code.name.monkey.retromusic.db.* import code.name.monkey.retromusic.fragments.search.Filter @@ -305,7 +305,7 @@ class RealRepository( roomRepository.playCountSongs() override fun observableHistorySongs(): LiveData> = - Transformations.map(roomRepository.observableHistorySongs()) { + roomRepository.observableHistorySongs().map { it.fromHistoryToSongs() } diff --git a/build.gradle b/build.gradle index 12df61e48..ce643b0b4 100644 --- a/build.gradle +++ b/build.gradle @@ -2,12 +2,12 @@ buildscript { ext { - lifecycle_version = '2.5.1' + lifecycle_version = '2.6.0-rc01' navigation_version = '2.5.3' mdc_version = '1.9.0-alpha02' preference_version = '1.2.0' appcompat_version = '1.6.1' - core_version = '1.9.0' + core_version = '1.10.0-beta01' } repositories { @@ -16,12 +16,12 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.4.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version" } } plugins { - id "com.github.ben-manes.versions" version "0.42.0" + id "com.github.ben-manes.versions" version "0.46.0" id 'com.google.devtools.ksp' version '1.8.10-1.0.9' apply false } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8049c684f..f2051ddb1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Mon Mar 06 21:09:43 IST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists