From dd1cb61579580d05da9379e7d82f93f211bdc8f9 Mon Sep 17 00:00:00 2001 From: "DEEP-PC\\deepp" Date: Tue, 22 Oct 2024 08:52:20 -0400 Subject: [PATCH] Update compile sdk to 35 Remove deprecated changes --- build.gradle | 48 +++++++++---------- .../slidingpanel/SlidingPanelLayout.kt | 3 -- .../brave/playlist/view/PlaylistToolbar.kt | 13 +---- 3 files changed, 26 insertions(+), 38 deletions(-) diff --git a/build.gradle b/build.gradle index e1f7ac6..7898ba9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'com.android.library' id 'org.jetbrains.kotlin.android' - id 'kotlin-kapt' + id 'com.google.devtools.ksp' } android { @@ -18,7 +18,7 @@ android { } } namespace 'com.brave.playlist' - compileSdk 34 + compileSdk 35 buildFeatures { buildConfig = true @@ -26,16 +26,12 @@ android { defaultConfig { minSdk 24 - targetSdk 34 - versionCode 1 - versionName '0.0.1' + targetSdk 35 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" vectorDrawables.useSupportLibrary = true - kapt { - arguments { - arg("room.schemaLocation", "$projectDir/schemas") - } + ksp { + arg("room.schemaLocation", "$projectDir/schemas") } } @@ -51,28 +47,25 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release } - debug { - debuggable true - } } 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' } } ext { exoplayerVersion = '1.0.2' // using 1.0.2 version to align with chromium dependency - room_version = "2.6.0" + room_version = "2.6.1" } dependencies { - implementation 'androidx.core:core-ktx:1.12.0' - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.10.0' + implementation 'androidx.core:core-ktx:1.13.1' + implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'com.google.android.material:material:1.12.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //noinspection GradleDependency @@ -86,7 +79,7 @@ dependencies { //noinspection GradleDependency implementation "androidx.media3:media3-exoplayer-hls:$exoplayerVersion" - implementation "com.google.android.gms:play-services-cast-framework:21.3.0" + implementation "com.google.android.gms:play-services-cast-framework:21.5.0" implementation "androidx.preference:preference-ktx:1.2.1" @@ -95,13 +88,20 @@ dependencies { implementation "androidx.room:room-runtime:$room_version" annotationProcessor "androidx.room:room-compiler:$room_version" //noinspection KaptUsageInsteadOfKsp - kapt "androidx.room:room-compiler:$room_version" +// kapt "androidx.room:room-compiler:$room_version" + ksp "androidx.room:room-compiler:$room_version" - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4' + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3' implementation "com.github.bumptech.glide:glide:4.12.0" testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.ext:junit:1.2.1' +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } } diff --git a/src/main/java/com/brave/playlist/slidingpanel/SlidingPanelLayout.kt b/src/main/java/com/brave/playlist/slidingpanel/SlidingPanelLayout.kt index e024048..bc6742e 100644 --- a/src/main/java/com/brave/playlist/slidingpanel/SlidingPanelLayout.kt +++ b/src/main/java/com/brave/playlist/slidingpanel/SlidingPanelLayout.kt @@ -26,7 +26,6 @@ import android.view.ViewGroup import android.view.accessibility.AccessibilityEvent import android.view.animation.Interpolator import androidx.core.content.res.ResourcesCompat -import androidx.core.view.ViewCompat import com.brave.playlist.R import java.util.concurrent.CopyOnWriteArrayList import kotlin.math.abs @@ -167,7 +166,6 @@ class BottomPanelLayout @JvmOverloads constructor( ) } == true) { setAllChildrenVisible() - ViewCompat.postInvalidateOnAnimation(this) } } @@ -724,7 +722,6 @@ class BottomPanelLayout @JvmOverloads constructor( mDragHelper?.abort() return } - ViewCompat.postInvalidateOnAnimation(this) } } diff --git a/src/main/java/com/brave/playlist/view/PlaylistToolbar.kt b/src/main/java/com/brave/playlist/view/PlaylistToolbar.kt index b71d45f..b24d79d 100644 --- a/src/main/java/com/brave/playlist/view/PlaylistToolbar.kt +++ b/src/main/java/com/brave/playlist/view/PlaylistToolbar.kt @@ -35,8 +35,6 @@ class PlaylistToolbar(context: Context, attrs: AttributeSet?, defStyleAttr: Int, private val ivMoveItem: AppCompatImageView private val ivDeleteItem: AppCompatImageView - private val defaultStatusBarColor: Int - constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : this( context, attrs, @@ -108,11 +106,6 @@ class PlaylistToolbar(context: Context, attrs: AttributeSet?, defStyleAttr: Int, ivDeleteItem = layoutEditToolbar.findViewById(R.id.ivDeleteItem) tvItemSelected.text = context.getString(R.string.playlist_number_selected, 0) - defaultStatusBarColor = if (context is AppCompatActivity) - context.window.statusBarColor - else - 0 - if (requireDarkMode) { tvTitleToolbarPlaylist.setTextColor(getColor(android.R.color.white)) ivBackToolbarPlaylist.setColorFilter(getColor(android.R.color.white)) @@ -130,15 +123,13 @@ class PlaylistToolbar(context: Context, attrs: AttributeSet?, defStyleAttr: Int, fun enableEditMode(enable: Boolean) { layoutMainToolbar.visibility = if (enable) GONE else VISIBLE layoutEditToolbar.visibility = if (enable) VISIBLE else GONE - setStatusBarInEditMode(enable) + setStatusBarInEditMode() } - private fun setStatusBarInEditMode(editMode: Boolean) { + private fun setStatusBarInEditMode() { if (context is AppCompatActivity) { val activity = context as AppCompatActivity activity.window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS) - activity.window.statusBarColor = - if (editMode) getColor(R.color.edit_toolbar) else defaultStatusBarColor } }