diff --git a/app/build.gradle b/app/build.gradle index 47b03cabd..3c30219dd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,12 +5,12 @@ apply plugin: 'kotlin-parcelize' apply plugin: 'com.google.devtools.ksp' android { - compileSdk 33 + compileSdk 34 namespace "code.name.monkey.retromusic" defaultConfig { minSdk 21 - targetSdk 33 + targetSdk 34 vectorDrawables.useSupportLibrary = true @@ -68,11 +68,11 @@ android { warning 'ImpliedQuantity', 'Instantiatable', 'MissingQuantity', 'MissingTranslation' } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" } dependenciesInfo { includeInApk = false diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e35633fe0..ebee6ad1f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,6 +21,7 @@ + diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt index 32de5ba6c..906fb83ea 100755 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt @@ -153,7 +153,7 @@ class SleepTimerDialog : DialogFragment() { timerDisplay.text = "$seekArcProgress min" } - private fun makeTimerPendingIntent(flag: Int): PendingIntent? { + private fun makeTimerPendingIntent(flag: Int): PendingIntent { return PendingIntent.getService( requireActivity(), 0, makeTimerIntent(), flag or if (VersionUtils.hasMarshmallow()) PendingIntent.FLAG_IMMUTABLE diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt index 8be801b9d..178a781f5 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt @@ -369,10 +369,10 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragme context, object : GestureDetector.SimpleOnGestureListener() { override fun onScroll( - e1: MotionEvent, + e1: MotionEvent?, e2: MotionEvent, distanceX: Float, - distanceY: Float, + distanceY: Float ): Boolean { return when { abs(distanceX) > abs(distanceY) -> { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt index 0ae18f6dd..168423873 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt @@ -164,7 +164,7 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(R.layout.fragment_mini_p private var flingPlayBackController = GestureDetector(context, object : GestureDetector.SimpleOnGestureListener() { override fun onFling( - e1: MotionEvent, + e1: MotionEvent?, e2: MotionEvent, velocityX: Float, velocityY: Float diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt index b028fc3d7..03f955549 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt @@ -220,7 +220,7 @@ class TinyPlayerFragment : AbsPlayerFragment(R.layout.fragment_tiny_player), } override fun onFling( - e1: MotionEvent, + e1: MotionEvent?, e2: MotionEvent, velocityX: Float, velocityY: Float diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NowPlayingSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NowPlayingSettingsFragment.kt index 8bc182e09..753707659 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NowPlayingSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NowPlayingSettingsFragment.kt @@ -72,7 +72,7 @@ class NowPlayingSettingsFragment : AbsSettingsFragment(), PreferenceUtil.unregisterOnSharedPreferenceChangedListener(this) } - override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) { + override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) { when (key) { NOW_PLAYING_SCREEN_ID -> updateNowPlayingScreenSummary() ALBUM_COVER_STYLE -> updateAlbumCoverStyleSummary() diff --git a/app/src/main/java/code/name/monkey/retromusic/lyrics/CoverLrcView.kt b/app/src/main/java/code/name/monkey/retromusic/lyrics/CoverLrcView.kt index 891181c3d..09e9d49ce 100644 --- a/app/src/main/java/code/name/monkey/retromusic/lyrics/CoverLrcView.kt +++ b/app/src/main/java/code/name/monkey/retromusic/lyrics/CoverLrcView.kt @@ -104,7 +104,7 @@ class CoverLrcView @JvmOverloads constructor( } override fun onScroll( - e1: MotionEvent, + e1: MotionEvent?, e2: MotionEvent, distanceX: Float, distanceY: Float, @@ -124,7 +124,7 @@ class CoverLrcView @JvmOverloads constructor( } override fun onFling( - e1: MotionEvent, + e1: MotionEvent?, e2: MotionEvent, velocityX: Float, velocityY: Float, diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt index f3ad767c5..94d4a4d4e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt +++ b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt @@ -628,9 +628,7 @@ class MusicService : MediaBrowserServiceCompat(), } } - override fun onSharedPreferenceChanged( - sharedPreferences: SharedPreferences, key: String, - ) { + override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) { when (key) { PLAYBACK_SPEED, PLAYBACK_PITCH -> { updateMediaSessionPlaybackState() diff --git a/appthemehelper/build.gradle b/appthemehelper/build.gradle index 775ae3229..1c658b559 100644 --- a/appthemehelper/build.gradle +++ b/appthemehelper/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdk 33 + compileSdk 34 namespace "code.name.monkey.appthemehelper" defaultConfig { minSdk 21 - targetSdk 33 + targetSdk 34 } buildTypes { release { @@ -18,8 +18,8 @@ android { abortOnError false } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } } diff --git a/gradle.properties b/gradle.properties index 5a5b46413..4518ce0db 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,4 +11,6 @@ android.nonTransitiveRClass=true # https://blog.jetbrains.com/kotlin/2022/07/a-new-approach-to-incremental-compilation-in-kotlin/ kotlin.incremental.useClasspathSnapshot=true # https://docs.gradle.org/7.5/userguide/configuration_cache.html -org.gradle.unsafe.configuration-cache=true \ No newline at end of file +org.gradle.unsafe.configuration-cache=true +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 67ef6aff5..b14a325fb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,8 +8,8 @@ afollestad_dialog_version = "3.3.0" coreSplashscreen = "1.0.0" customactivityoncrash = "2.4.0" fadingedgelayout = "1.0.0" -google_featureDelivery_version = "2.0.1" -gradle = "7.4.2" +google_featureDelivery_version = "2.1.0" +gradle = "8.5.1" dhaval2404_imagepicker_version = "2.1" chrisbanes_insetter_version = "0.6.1" jaudiotagger = "2.3.15" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f2051ddb1..0ccd4cd94 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +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.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists