Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update dependencies & compileSdkVersion

Browse source
This commit is contained in:
Prathamesh More 2023-03-06 12:11:20 +05:30
parent d6a21ee42b
commit 4236a134ad
9 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/build.gradle
View file

@ -5,7 +5,7 @@ apply plugin: "androidx.navigation.safeargs.kotlin"
apply plugin: 'kotlin-parcelize'
android {
compileSdk 32
compileSdk 33
namespace "code.name.monkey.retromusic"
defaultConfig {
@ -78,7 +78,7 @@ android {
includeInApk = false
includeInBundle = false
}
configurations.all {
configurations.configureEach {
resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9'
}
}
@ -103,7 +103,7 @@ dependencies {
implementation "androidx.gridlayout:gridlayout:1.0.0"
implementation "androidx.appcompat:appcompat:$appcompat_version"
implementation 'androidx.annotation:annotation:1.4.0'
implementation 'androidx.annotation:annotation:1.6.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation "androidx.preference:preference-ktx:$preference_version"
@ -112,7 +112,7 @@ dependencies {
implementation 'androidx.mediarouter:mediarouter:1.3.1'
//Cast Dependencies
normalImplementation 'com.google.android.gms:play-services-cast-framework:21.1.0'
normalImplementation 'com.google.android.gms:play-services-cast-framework:21.2.0'
//WebServer by NanoHttpd
normalImplementation "org.nanohttpd:nanohttpd:2.3.1"
@ -120,7 +120,7 @@ dependencies {
implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
def room_version = '2.5.0-alpha02'
def room_version = '2.5.0'
implementation "androidx.room:room-runtime:$room_version"
implementation "androidx.room:room-ktx:$room_version"
kapt "androidx.room:room-compiler:$room_version"
@ -131,8 +131,8 @@ dependencies {
implementation "androidx.core:core-splashscreen:1.0.0"
normalImplementation 'com.google.android.play:feature-delivery:2.0.0'
normalImplementation 'com.google.android.play:review:2.0.0'
normalImplementation 'com.google.android.play:feature-delivery:2.0.1'
normalImplementation 'com.google.android.play:review:2.0.1'
implementation "com.google.android.material:material:$mdc_version"
@ -150,11 +150,11 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
def koin_version = '3.2.0'
def koin_version = '3.3.3'
implementation "io.insert-koin:koin-core:$koin_version"
implementation "io.insert-koin:koin-android:$koin_version"
def glide_version = '4.13.2'
def glide_version = '4.15.0'
implementation "com.github.bumptech.glide:glide:$glide_version"
kapt "com.github.bumptech.glide:compiler:$glide_version"
implementation "com.github.bumptech.glide:okhttp3-integration:$glide_version"
@ -174,7 +174,7 @@ dependencies {
implementation 'com.r0adkll:slidableactivity:2.1.0'
implementation 'com.heinrichreimersoftware:material-intro:2.0.0'
implementation 'com.github.dhaval2404:imagepicker:2.1'
implementation 'me.zhanghai.android.fastscroll:library:1.1.8'
implementation 'me.zhanghai.android.fastscroll:library:1.2.0'
implementation 'cat.ereza:customactivityoncrash:2.4.0'
implementation 'me.tankery.lib:circularSeekBar:1.4.1'
}

2
app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt
View file

@ -332,7 +332,7 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
inflater.inflate(R.menu.menu_album_detail, menu)
val sortOrder = menu.findItem(R.id.action_sort_order)
setUpSortOrderMenu(sortOrder.subMenu)
setUpSortOrderMenu(sortOrder.subMenu!!)
ToolbarContentTintHelper.handleOnCreateOptionsMenu(
requireContext(),
binding.toolbar,

6
app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt
View file

@ -148,10 +148,10 @@ class AlbumsFragment : AbsRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridL
if (RetroUtil.isLandscape) {
gridSizeItem.setTitle(R.string.action_grid_size_land)
}
setUpGridSizeMenu(gridSizeItem.subMenu)
setUpGridSizeMenu(gridSizeItem.subMenu!!)
val layoutItem = menu.findItem(R.id.action_layout_type)
setupLayoutMenu(layoutItem.subMenu)
setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu)
setupLayoutMenu(layoutItem.subMenu!!)
setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu!!)
//Setting up cast button
requireContext().setUpMediaRouteButton(menu)
}

6
app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistsFragment.kt
View file

@ -159,10 +159,10 @@ class ArtistsFragment : AbsRecyclerViewCustomGridSizeFragment<ArtistAdapter, Gri
if (RetroUtil.isLandscape) {
gridSizeItem.setTitle(R.string.action_grid_size_land)
}
setUpGridSizeMenu(gridSizeItem.subMenu)
setUpGridSizeMenu(gridSizeItem.subMenu!!)
val layoutItem = menu.findItem(R.id.action_layout_type)
setupLayoutMenu(layoutItem.subMenu)
setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu)
setupLayoutMenu(layoutItem.subMenu!!)
setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu!!)
setupAlbumArtistMenu(menu)
//Setting up cast button
requireContext().setUpMediaRouteButton(menu)

6
app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
View file

@ -352,8 +352,8 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
context,
object : GestureDetector.SimpleOnGestureListener() {
override fun onScroll(
e1: MotionEvent?,
e2: MotionEvent?,
e1: MotionEvent,
e2: MotionEvent,
distanceX: Float,
distanceY: Float,
): Boolean {
@ -371,7 +371,7 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme
})
@SuppressLint("ClickableViewAccessibility")
override fun onTouch(v: View, event: MotionEvent?): Boolean {
override fun onTouch(v: View, event: MotionEvent): Boolean {
viewPager?.dispatchTouchEvent(event)
return flingPlayBackController.onTouchEvent(event)
}

4
app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt
View file

@ -213,8 +213,8 @@ class TinyPlayerFragment : AbsPlayerFragment(R.layout.fragment_tiny_player),
gestureDetector = GestureDetector(context, object :
GestureDetector.SimpleOnGestureListener() {
override fun onLongPress(e: MotionEvent?) {
if (abs(e!!.y - initialY) <= 2) {
override fun onLongPress(e: MotionEvent) {
if (abs(e.y - initialY) <= 2) {
vibrate()
isDragEnabled = true
binding.progressBar.parent.requestDisallowInterceptTouchEvent(true)

4
app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt
View file

@ -76,12 +76,12 @@ class PlaylistsFragment :
if (RetroUtil.isLandscape) {
gridSizeItem.setTitle(R.string.action_grid_size_land)
}
setupGridSizeMenu(gridSizeItem.subMenu)
setupGridSizeMenu(gridSizeItem.subMenu!!)
menu.removeItem(R.id.action_layout_type)
menu.add(0, R.id.action_add_to_playlist, 0, R.string.new_playlist_title)
menu.add(0, R.id.action_import_playlist, 0, R.string.import_playlist)
menu.findItem(R.id.action_settings).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu)
setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu!!)
MenuCompat.setGroupDividerEnabled(menu, true)
//Setting up cast button
requireContext().setUpMediaRouteButton(menu)

6
app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt
View file

@ -114,10 +114,10 @@ class SongsFragment : AbsRecyclerViewCustomGridSizeFragment<SongAdapter, GridLay
if (RetroUtil.isLandscape) {
gridSizeItem.setTitle(R.string.action_grid_size_land)
}
setUpGridSizeMenu(gridSizeItem.subMenu)
setUpGridSizeMenu(gridSizeItem.subMenu!!)
val layoutItem = menu.findItem(R.id.action_layout_type)
setupLayoutMenu(layoutItem.subMenu)
setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu)
setupLayoutMenu(layoutItem.subMenu!!)
setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu!!)
//Setting up cast button
requireContext().setUpMediaRouteButton(menu)
}

14
build.gradle
View file

@ -3,11 +3,11 @@
buildscript {
ext {
lifecycle_version='2.5.1'
navigation_version = '2.5.1'
mdc_version = '1.7.0-rc01'
navigation_version = '2.5.3'
mdc_version = '1.9.0-alpha02'
preference_version = '1.2.0'
appcompat_version = '1.5.0'
core_version='1.8.0'
appcompat_version = '1.6.1'
core_version='1.9.0'
}
repositories {
@ -15,8 +15,8 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.2.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
}
}
@ -24,6 +24,6 @@ plugins {
id "com.github.ben-manes.versions" version "0.42.0"
}
task clean(type: Delete) {
tasks.register('clean', Delete) {
delete rootProject.buildDir
}