Skip to content

Commit 19f5d07

Browse files
committed
Analysis: Replace deprecated parcelize import for wordpress
Parcelize annotations from package 'kotlinx.android.parcel' are deprecated. The newly 'kotlinx.parcelize' package is now the default and as such the corresponding import have been updated accordingly. Also, as part of this change the new 'ParcelCreator' error needs to be suppressed since it is a false positive. Classes which use @parcelize don't need to manually implement 'ParcelCreator' anymore. Documentation: https://developer.android.com/kotlin/parcelize
1 parent 05b95a8 commit 19f5d07

File tree

16 files changed

+42
-19
lines changed

16 files changed

+42
-19
lines changed

WordPress/src/main/java/org/wordpress/android/ui/domains/DomainProductDetails.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package org.wordpress.android.ui.domains
22

3+
import android.annotation.SuppressLint
34
import android.os.Parcelable
4-
import kotlinx.android.parcel.Parcelize
5+
import kotlinx.parcelize.Parcelize
56

67
@Parcelize
8+
@SuppressLint("ParcelCreator")
79
data class DomainProductDetails(
810
val productId: Int,
911
val domainName: String

WordPress/src/main/java/org/wordpress/android/ui/engagement/ListScenario.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package org.wordpress.android.ui.engagement
22

3+
import android.annotation.SuppressLint
34
import android.os.Parcelable
4-
import kotlinx.android.parcel.Parcelize
5+
import kotlinx.parcelize.Parcelize
56

67
@Parcelize
8+
@SuppressLint("ParcelCreator")
79
data class ListScenario(
810
val type: ListScenarioType,
911
val source: EngagementNavigationSource,
@@ -26,6 +28,7 @@ enum class ListScenarioType(val typeDescription: String) {
2628
}
2729

2830
@Parcelize
31+
@SuppressLint("ParcelCreator")
2932
data class HeaderData constructor(
3033
val authorName: AuthorName,
3134
val snippetText: String,
@@ -36,6 +39,7 @@ data class HeaderData constructor(
3639
val numLikes: Int = 0
3740
) : Parcelable
3841

42+
@SuppressLint("ParcelCreator")
3943
sealed class AuthorName : Parcelable {
4044
@Parcelize
4145
data class AuthorNameString(val nameString: String?) : AuthorName()

WordPress/src/main/java/org/wordpress/android/ui/history/HistoryListItem.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package org.wordpress.android.ui.history
22

33
import android.annotation.SuppressLint
44
import android.os.Parcelable
5-
import kotlinx.android.parcel.IgnoredOnParcel
6-
import kotlinx.android.parcel.Parcelize
7-
import kotlinx.android.parcel.RawValue
5+
import kotlinx.parcelize.IgnoredOnParcel
6+
import kotlinx.parcelize.Parcelize
7+
import kotlinx.parcelize.RawValue
88
import org.wordpress.android.WordPress
99
import org.wordpress.android.fluxc.model.revisions.Diff
1010
import org.wordpress.android.fluxc.model.revisions.RevisionModel

WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadViewModel.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import androidx.lifecycle.LiveData
88
import androidx.lifecycle.MediatorLiveData
99
import androidx.lifecycle.MutableLiveData
1010
import androidx.lifecycle.Observer
11-
import kotlinx.android.parcel.Parcelize
11+
import kotlinx.parcelize.Parcelize
1212
import kotlinx.coroutines.CoroutineDispatcher
1313
import kotlinx.coroutines.flow.collect
1414
import org.json.JSONObject
@@ -447,6 +447,7 @@ class BackupDownloadViewModel @Inject constructor(
447447
)
448448
}
449449

450+
@SuppressLint("ParcelCreator")
450451
sealed class BackupDownloadWizardState : Parcelable {
451452
@Parcelize
452453
object BackupDownloadCanceled : BackupDownloadWizardState()

WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreViewModel.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import androidx.lifecycle.LiveData
88
import androidx.lifecycle.MediatorLiveData
99
import androidx.lifecycle.MutableLiveData
1010
import androidx.lifecycle.Observer
11-
import kotlinx.android.parcel.Parcelize
11+
import kotlinx.parcelize.Parcelize
1212
import kotlinx.coroutines.CoroutineDispatcher
1313
import kotlinx.coroutines.flow.collect
1414
import org.json.JSONObject
@@ -535,6 +535,7 @@ class RestoreViewModel @Inject constructor(
535535
SnackbarMessageHolder(UiStringRes(R.string.restore_another_process_running))
536536
}
537537

538+
@SuppressLint("ParcelCreator")
538539
sealed class RestoreWizardState : Parcelable {
539540
@Parcelize
540541
object RestoreCanceled : RestoreWizardState()

WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryViewModel.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package org.wordpress.android.ui.jetpack.scan.history
22

3+
import android.annotation.SuppressLint
34
import android.os.Parcelable
45
import androidx.annotation.DrawableRes
56
import androidx.lifecycle.LiveData
67
import androidx.lifecycle.MutableLiveData
7-
import kotlinx.android.parcel.Parcelize
8+
import kotlinx.parcelize.Parcelize
89
import kotlinx.coroutines.CoroutineDispatcher
910
import kotlinx.coroutines.delay
1011
import org.wordpress.android.R
@@ -103,6 +104,7 @@ class ScanHistoryViewModel @Inject constructor(
103104
}
104105

105106
@Parcelize
107+
@SuppressLint("ParcelCreator")
106108
enum class ScanHistoryTabType : Parcelable {
107109
ALL, FIXED, IGNORED
108110
}

WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryModel.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package org.wordpress.android.ui.layoutpicker
22

3+
import android.annotation.SuppressLint
34
import android.os.Parcelable
4-
import kotlinx.android.parcel.Parcelize
5+
import kotlinx.parcelize.Parcelize
56
import org.wordpress.android.fluxc.network.rest.wpcom.site.GutenbergLayoutCategory
67
import org.wordpress.android.fluxc.network.rest.wpcom.theme.StarterDesignCategory
78

89
@Parcelize
10+
@SuppressLint("ParcelCreator")
911
class LayoutCategoryModel(
1012
private val starterDesignCategory: StarterDesignCategory? = null,
1113
private val blockLayoutCategory: GutenbergLayoutCategory? = null

WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutModel.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package org.wordpress.android.ui.layoutpicker
22

3+
import android.annotation.SuppressLint
34
import android.os.Parcelable
4-
import kotlinx.android.parcel.Parcelize
5+
import kotlinx.parcelize.Parcelize
56
import org.wordpress.android.fluxc.network.rest.wpcom.site.GutenbergLayout
67
import org.wordpress.android.fluxc.network.rest.wpcom.theme.StarterDesign
78

89
@Parcelize
10+
@SuppressLint("ParcelCreator")
911
data class LayoutModel(
1012
val slug: String,
1113
val title: String,

WordPress/src/main/java/org/wordpress/android/ui/posts/BasicDialogViewModel.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package org.wordpress.android.ui.posts
22

3+
import android.annotation.SuppressLint
34
import android.os.Parcelable
45
import androidx.fragment.app.FragmentManager
56
import androidx.lifecycle.LiveData
67
import androidx.lifecycle.MutableLiveData
78
import androidx.lifecycle.ViewModel
8-
import kotlinx.android.parcel.Parcelize
9+
import kotlinx.parcelize.Parcelize
910
import org.wordpress.android.ui.posts.BasicDialogViewModel.DialogInteraction.Dismissed
1011
import org.wordpress.android.ui.posts.BasicDialogViewModel.DialogInteraction.Negative
1112
import org.wordpress.android.ui.posts.BasicDialogViewModel.DialogInteraction.Positive
@@ -35,6 +36,7 @@ class BasicDialogViewModel
3536
}
3637

3738
@Parcelize
39+
@SuppressLint("ParcelCreator")
3840
data class BasicDialogModel(
3941
val tag: String,
4042
val title: String? = null,

WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingViewModel.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package org.wordpress.android.ui.posts
22

3+
import android.annotation.SuppressLint
34
import android.os.Bundle
45
import android.os.Parcelable
56
import androidx.lifecycle.LiveData
67
import androidx.lifecycle.MutableLiveData
78
import androidx.lifecycle.ViewModel
8-
import kotlinx.android.parcel.Parcelize
9+
import kotlinx.parcelize.Parcelize
910
import org.greenrobot.eventbus.Subscribe
1011
import org.greenrobot.eventbus.ThreadMode
1112
import org.wordpress.android.fluxc.Dispatcher
@@ -155,6 +156,7 @@ class PrepublishingViewModel @Inject constructor(private val dispatcher: Dispatc
155156
}
156157

157158
@Parcelize
159+
@SuppressLint("ParcelCreator")
158160
enum class PrepublishingScreen : Parcelable {
159161
HOME,
160162
PUBLISH,

0 commit comments

Comments
 (0)