Merge pull request #4555 from Isira-Seneviratne/KSP

chore: Migrate to KSP
libre-tube · Aug 20, 2023 · 2b33de7 · 2b33de7
2 parents 4dc18cb + f69f835
commit 2b33de7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,8 +2,8 @@ import java.time.Instant
 
 plugins {
     id 'com.android.application'
+    id 'com.google.devtools.ksp'
     id 'kotlin-android'
-    id 'kotlin-kapt'
     id 'kotlinx-serialization'
     id 'kotlin-parcelize'
 }
@@ -20,10 +20,9 @@ android {
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         resValue "string", "app_name", "LibreTube"
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments += ["room.schemaLocation": "$projectDir/schemas".toString()]
-            }
+        ksp {
+            arg("room.schemaLocation", "$projectDir/schemas")
+            arg("exportSchema", "true")
         }
     }
 
@@ -126,7 +125,7 @@ dependencies {
     implementation libs.coil
 
     /* Room */
-    kapt libs.room.compiler
+    ksp libs.room.compiler
     implementation libs.room
 }
 

diff --git a/app/src/main/java/com/github/libretube/db/obj/SubscriptionGroup.kt b/app/src/main/java/com/github/libretube/db/obj/SubscriptionGroup.kt
@@ -8,5 +8,5 @@ import kotlinx.serialization.Serializable
 @Entity(tableName = "subscriptionGroups")
 data class SubscriptionGroup(
     @PrimaryKey var name: String,
-    val channels: MutableList<String>
+    var channels: List<String>
 )
diff --git a/app/src/main/java/com/github/libretube/ui/adapters/SubscriptionGroupChannelsAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/SubscriptionGroupChannelsAdapter.kt
@@ -39,7 +39,7 @@ class SubscriptionGroupChannelsAdapter(
             channelIncluded.setOnCheckedChangeListener(null)
             channelIncluded.isChecked = group.channels.contains(channelId)
             channelIncluded.setOnCheckedChangeListener { _, isChecked ->
-                if (isChecked) group.channels.add(channelId) else group.channels.remove(channelId)
+                if (isChecked) group.channels += channelId else group.channels -= channelId
                 onGroupChanged(group)
             }
         }

diff --git a/build.gradle b/build.gradle
@@ -20,6 +20,10 @@ buildscript {
     }
 }
 
+plugins {
+    id 'com.google.devtools.ksp' version '1.9.0-1.0.12' apply false
+}
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }