Update libraries

Update libs to new versions, including the nav framework from 1.0.0 -> 2.3.4.
This commit is contained in:
OxygenCobalt 2021-03-20 19:54:41 -06:00
parent 66685350cb
commit 824ac56bfa
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
5 changed files with 15 additions and 11 deletions

View file

@ -17,8 +17,6 @@ android {
buildFeatures { buildFeatures {
dataBinding true dataBinding true
} }
vectorDrawables.useSupportLibrary = true
} }
buildTypes { buildTypes {
@ -63,8 +61,8 @@ dependencies {
// General // General
implementation 'androidx.core:core-ktx:1.3.2' implementation 'androidx.core:core-ktx:1.3.2'
implementation 'androidx.activity:activity-ktx:1.3.0-alpha03' implementation 'androidx.activity:activity-ktx:1.3.0-alpha04'
implementation 'androidx.fragment:fragment-ktx:1.3.0' implementation 'androidx.fragment:fragment-ktx:1.3.1'
// Layout // Layout
implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
@ -73,7 +71,6 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
// Navigation // Navigation
def navigation_version = "2.3.3"
implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version" implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
implementation "androidx.navigation:navigation-ui-ktx:$navigation_version" implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
@ -90,7 +87,7 @@ dependencies {
// --- THIRD PARTY --- // --- THIRD PARTY ---
// ExoPlayer // ExoPlayer
def exoplayer_version = "2.12.3" def exoplayer_version = "2.13.2"
implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version" implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version"
implementation "com.google.android.exoplayer:extension-mediasession:$exoplayer_version" implementation "com.google.android.exoplayer:extension-mediasession:$exoplayer_version"

View file

@ -42,6 +42,7 @@ class MusicLoader(private val context: Context) {
linkGenres() linkGenres()
} }
@Suppress("DEPRECATION")
private fun buildSelector() { private fun buildSelector() {
val blacklistDatabase = BlacklistDatabase.getInstance(context) val blacklistDatabase = BlacklistDatabase.getInstance(context)

View file

@ -58,7 +58,6 @@ import org.oxycblt.auxio.ui.getSystemServiceSafe
*/ */
class PlaybackService : Service(), Player.EventListener, PlaybackStateManager.Callback, SettingsManager.Callback { class PlaybackService : Service(), Player.EventListener, PlaybackStateManager.Callback, SettingsManager.Callback {
private val player: SimpleExoPlayer by lazy(::newPlayer) private val player: SimpleExoPlayer by lazy(::newPlayer)
private val playbackManager = PlaybackStateManager.getInstance() private val playbackManager = PlaybackStateManager.getInstance()
private val settingsManager = SettingsManager.getInstance() private val settingsManager = SettingsManager.getInstance()

View file

@ -98,7 +98,7 @@ class BlacklistDialog : BottomSheetDialogFragment() {
folderChooser( folderChooser(
requireContext(), requireContext(),
initialDirectory = File(Environment.getExternalStorageDirectory().absolutePath), initialDirectory = File(getRootPath()),
emptyTextRes = R.string.label_no_dirs emptyTextRes = R.string.label_no_dirs
) )
@ -122,7 +122,7 @@ class BlacklistDialog : BottomSheetDialogFragment() {
// Due to how Auxio's navigation flow works, dont allow the main root directory // Due to how Auxio's navigation flow works, dont allow the main root directory
// to be excluded, as that would lead to the user being stuck at the "No Music Found" // to be excluded, as that would lead to the user being stuck at the "No Music Found"
// screen. // screen.
if (path == Environment.getExternalStorageDirectory().absolutePath) { if (path == getRootPath()) {
getString(R.string.error_brick_dir).createToast(requireContext()) getString(R.string.error_brick_dir).createToast(requireContext())
return return
@ -149,4 +149,9 @@ class BlacklistDialog : BottomSheetDialogFragment() {
exitProcess(0) exitProcess(0)
} }
@Suppress("DEPRECATION")
private fun getRootPath(): String {
return Environment.getExternalStorageDirectory().absolutePath
}
} }

View file

@ -1,15 +1,17 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '1.4.31' ext.kotlin_version = '1.4.31'
ext.navigation_version = "2.3.4"
repositories { repositories {
google() google()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.2' classpath 'com.android.tools.build:gradle:4.1.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:1.0.0" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files