Remove kotlinx-collections-immutable-jvm

app/build.gradle.kts

@@ -196,7 +196,6 @@ dependencies {
     debugImplementation("org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin}")
 
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${Versions.kotlin}")
-    implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.4")
     implementation("com.squareup.okhttp3:okhttp:${Versions.okhttp}")
     implementation("com.google.code.gson:gson:2.8.8")
     implementation("com.google.android.material:material:1.5.0-rc01")

app/licenses.yml

@@ -638,10 +638,6 @@
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/license/LICENSE-2.0.txt
   url: https://github.com/dmfs/jems
-- artifact: org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:+
-  name: kotlinx-collections-immutable-jvm
-  copyrightHolder: JetBrains s.r.o.
-  license: The Apache Software License, Version 2.0
 - artifact: com.squareup.okio:okio:+
   name: okio
   copyrightHolder: Square, Inc.

app/src/main/assets/licenses.json

@@ -1525,18 +1525,6 @@
       "url": "https://github.com/dmfs/jems",
       "libraryName": "jems"
     },
-    {
-      "artifactId": {
-        "name": "kotlinx-collections-immutable-jvm",
-        "group": "org.jetbrains.kotlinx",
-        "version": "+"
-      },
-      "copyrightHolder": "JetBrains s.r.o.",
-      "copyrightStatement": "Copyright © JetBrains s.r.o. All rights reserved.",
-      "license": "The Apache Software License, Version 2.0",
-      "normalizedLicense": "apache2",
-      "libraryName": "kotlinx-collections-immutable-jvm"
-    },
     {
       "artifactId": {
         "name": "okio",

app/src/main/java/com/todoroo/astrid/service/TaskDeleter.kt

@@ -2,7 +2,6 @@ package com.todoroo.astrid.service
 
 import com.todoroo.astrid.api.Filter
 import com.todoroo.astrid.data.Task
-import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.runBlocking
 import org.tasks.LocalBroadcastManager
 import org.tasks.caldav.VtodoCache
@@ -32,7 +31,7 @@ class TaskDeleter @Inject constructor(
         private val vtodoCache: VtodoCache,
     ) {
 
-    suspend fun markDeleted(item: Task) = markDeleted(persistentListOf(item.id))
+    suspend fun markDeleted(item: Task) = markDeleted(listOf(item.id))
 
     suspend fun markDeleted(taskIds: List<Long>): List<Task> {
         val ids: MutableSet<Long> = HashSet(taskIds)
@@ -61,7 +60,7 @@ class TaskDeleter @Inject constructor(
 
     suspend fun delete(task: Task) = delete(task.id)
 
-    suspend fun delete(task: Long) = delete(persistentListOf(task))
+    suspend fun delete(task: Long) = delete(listOf(task))
 
     suspend fun delete(tasks: List<Long>) {
         deletionDao.delete(tasks)

app/src/main/java/org/tasks/data/TaskListQuery.kt

@@ -6,7 +6,6 @@ import com.todoroo.andlib.sql.Join
 import com.todoroo.astrid.activity.TaskListFragment
 import com.todoroo.astrid.api.Filter
 import com.todoroo.astrid.data.Task
-import kotlinx.collections.immutable.persistentListOf
 import org.tasks.data.TaskListQueryNonRecursive.getNonRecursiveQuery
 import org.tasks.data.TaskListQueryRecursive.getRecursiveQuery
 import org.tasks.preferences.QueryPreferences
@@ -24,7 +23,7 @@ object TaskListQuery {
         ${Join.left(Geofence.TABLE, Geofence.TASK.eq(Task.ID))}
         ${Join.left(Place.TABLE, Place.UID.eq(Geofence.PLACE))}
     """.trimIndent()
-    val FIELDS = persistentListOf(
+    val FIELDS = listOf(
             field("tasks.*"),
             field("${TaskListFragment.GTASK_METADATA_JOIN}.*"),
             field("${TaskListFragment.CALDAV_METADATA_JOIN}.*"),

app/src/main/java/org/tasks/jobs/NotificationQueue.kt

@@ -3,7 +3,6 @@ package org.tasks.jobs
 import com.google.common.collect.Ordering
 import com.google.common.collect.TreeMultimap
 import com.google.common.primitives.Ints
-import kotlinx.collections.immutable.toImmutableList
 import org.tasks.preferences.Preferences
 import org.tasks.time.DateTime
 import javax.inject.Inject
@@ -73,7 +72,7 @@ class NotificationQueue @Inject constructor(
 
     fun size() = jobs.size()
 
-    fun getJobs() = jobs.values().toImmutableList()
+    fun getJobs() = jobs.values().toList()
 
     fun isEmpty() = jobs.isEmpty
 

app/src/main/java/org/tasks/scheduling/RefreshScheduler.kt

@@ -1,7 +1,6 @@
 package org.tasks.scheduling
 
 import com.todoroo.astrid.data.Task
-import kotlinx.collections.immutable.toImmutableList
 import org.tasks.data.TaskDao
 import org.tasks.jobs.WorkManager
 import org.tasks.time.DateTimeUtils
@@ -36,7 +35,7 @@ class RefreshScheduler @Inject internal constructor(
 
     @Synchronized
     fun scheduleNext() {
-        val lapsed = jobs.headSet(DateTimeUtils.currentTimeMillis() + 1).toImmutableList()
+        val lapsed = jobs.headSet(DateTimeUtils.currentTimeMillis() + 1).toList()
         jobs.removeAll(lapsed)
         if (!jobs.isEmpty()) {
             workManager.scheduleRefresh(jobs.first())

app/src/main/java/org/tasks/ui/TaskEditViewModel.kt

@@ -25,8 +25,6 @@ import com.todoroo.astrid.service.TaskMover
 import com.todoroo.astrid.timers.TimerPlugin
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.collections.immutable.ImmutableList
-import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.runBlocking
@@ -97,7 +95,7 @@ class TaskEditViewModel @Inject constructor(
         isNew = task.isNew
         originalList = list
         originalLocation = location
-        originalTags = tags.toImmutableList()
+        originalTags = tags.toList()
         originalAlarms =
             if (isNew) {
                 ArrayList<Alarm>().apply {
@@ -255,7 +253,7 @@ class TaskEditViewModel @Inject constructor(
 
     var selectedLocation: Location? = null
 
-    var originalTags: ImmutableList<TagData>? = null
+    var originalTags: List<TagData>? = null
         private set(value) {
             field = value
             selectedTags = value?.let { ArrayList(it) }

deps_fdroid.txt

@@ -335,9 +335,6 @@
 ++--- io.noties.markwon:linkify:4.6.2
 +|    \--- io.noties.markwon:core:4.6.2 (*)
 ++--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 (*)
-++--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.4
-+|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.6.10 (*)
-+|    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -> 1.6.10
 ++--- com.squareup.okhttp3:okhttp:4.9.3
 +|    +--- com.squareup.okio:okio:2.8.0
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.6.10 (*)

deps_googleplay.txt

@@ -433,9 +433,6 @@
 ++--- io.noties.markwon:linkify:4.6.2
 +|    \--- io.noties.markwon:core:4.6.2 (*)
 ++--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10 (*)
-++--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.4
-+|    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 -> 1.6.10 (*)
-+|    \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 -> 1.6.10
 ++--- com.squareup.okhttp3:okhttp:4.9.3
 +|    +--- com.squareup.okio:okio:2.8.0
 +|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.6.10 (*)