From 6becd9a9b31bf79563893a2f3344e7d52a12b977 Mon Sep 17 00:00:00 2001
From: Xilin Jia <6257601+XilinJia@users.noreply.github.com>
Date: Mon, 20 May 2024 10:44:25 +0100
Subject: [PATCH] 0.26.9 commit

---
 app/build.gradle                                         | 9 +++++----
 .../schabi/newpipe/player/playback/MediaSourceManager.kt | 4 ++--
 build.gradle                                             | 6 +++++-
 changelog.md                                             | 1 +
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e50d819..3871523 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,8 @@ import com.android.tools.profgen.DexFile
 plugins {
     id "com.android.application"
     id "kotlin-android"
-    id "kotlin-kapt"
+//    id "kotlin-kapt"
+    id 'com.google.devtools.ksp'
     id "kotlin-parcelize"
 //    id "checkstyle"
     id "org.sonarqube" version "4.0.0.2929"
@@ -240,7 +241,7 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation "androidx.room:room-runtime:${androidxRoomVersion}"
     implementation "androidx.room:room-rxjava3:${androidxRoomVersion}"
-    kapt "androidx.room:room-compiler:${androidxRoomVersion}"
+    ksp "androidx.room:room-compiler:${androidxRoomVersion}"
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     // Newer version specified to prevent accessibility regressions with RecyclerView, see:
     // https://developer.android.com/jetpack/androidx/releases/viewpager2#1.1.0-alpha01
@@ -252,7 +253,7 @@ dependencies {
 /** Third-party libraries **/
     // Instance state boilerplate elimination
     implementation "frankiesardo:icepick:${icepickVersion}"
-    kapt "frankiesardo:icepick-processor:${icepickVersion}"
+    ksp "frankiesardo:icepick-processor:${icepickVersion}"
 
     // HTML parser
     implementation 'org.jsoup:jsoup:1.17.2'
@@ -274,7 +275,7 @@ dependencies {
 
     // Metadata generator for service descriptors
     compileOnly "com.google.auto.service:auto-service-annotations:${googleAutoServiceVersion}"
-    kapt "com.google.auto.service:auto-service:${googleAutoServiceVersion}"
+    ksp "com.google.auto.service:auto-service:${googleAutoServiceVersion}"
 
     // Manager for complex RecyclerView layouts
     implementation "com.github.lisawray.groupie:groupie:${groupieVersion}"
diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.kt b/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.kt
index f6566b9..1f050a3 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.kt
+++ b/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.kt
@@ -259,8 +259,8 @@ class MediaSourceManager private constructor(listener: PlaybackListener, playQue
 
     private val edgeIntervalSignal: Observable<Long>
         /*//////////////////////////////////////////////////////////////////////////
-    // MediaSource Loading
-    ////////////////////////////////////////////////////////////////////////// */
+        // MediaSource Loading
+        ////////////////////////////////////////////////////////////////////////// */
         get() = Observable.interval(progressUpdateIntervalMillis, TimeUnit.MILLISECONDS, AndroidSchedulers.mainThread())
             .filter { ignored: Long? -> playbackListener.isApproachingPlaybackEdge(playbackNearEndGapMillis) }
 
diff --git a/build.gradle b/build.gradle
index 7e58fd2..31594d6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.9.23'
+    ext.kotlin_version = '1.9.24'
     repositories {
         google()
         mavenCentral()
@@ -15,6 +15,10 @@ buildscript {
     }
 }
 
+plugins {
+    id 'com.google.devtools.ksp' version '1.9.24-1.0.20' apply false
+}
+
 allprojects {
     repositories {
         google()
diff --git a/changelog.md b/changelog.md
index 8290a6e..23c42b8 100644
--- a/changelog.md
+++ b/changelog.md
@@ -95,3 +95,4 @@ There is already an open issue on [androidx.media3](https://github.com/androidx/
 ## 0.26.9
 
 * suppressed Log.d message in release app
+* changed kapt to ksp