Update target sdk to 34

2025-05-17 23:55:21 +01:00 · 2024-10-11 22:58:23 +02:00 · 2024-10-11 22:58:23 +02:00 · 28fd3fb218
commit 28fd3fb218
parent 1859354f94
13 changed files with 25 additions and 24 deletions
--- 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
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -21,6 +21,7 @@
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
    <uses-permission
        android:name="android.permission.WRITE_SETTINGS"
        tools:ignore="ProtectedPermissions" />
--- 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
--- 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) -> {
--- 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
--- 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
--- 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()
--- 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,
--- 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()
--- 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
    }
 }

--- a/gradle.properties
+++ b/gradle.properties
@ -12,3 +12,5 @@ android.nonTransitiveRClass=true
 kotlin.incremental.useClasspathSnapshot=true
 # https://docs.gradle.org/7.5/userguide/configuration_cache.html
 org.gradle.unsafe.configuration-cache=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
--- 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"
--- 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