Merge pull request #18303 from wordpress-mobile/deps/update-androidx-compose-compiler-and-kotlin-to-1.3.2-and-1.7.20

ovitrif · web-flow · commit 496f0c61d6a6 · 2023-04-24T13:08:56.000+02:00
[Dependency Updates] Update `androidxComposeCompilerVersion` and `kotlinVersion` to 1.3.2 and 1.7.20
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt
@@ -114,7 +114,7 @@ class ActivityLogListFragment : Fragment(R.layout.activity_log_list_fragment) {
         }
     }
 
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         with(requireActivity()) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsFragment.kt
@@ -124,7 +124,7 @@ class ThreatDetailsFragment : Fragment(R.layout.threat_details_fragment) {
         threatActionDialog?.show()
     }
 
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         if (requireActivity().intent.extras?.containsKey(WordPress.SITE) != true) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpackplugininstall/fullplugin/install/JetpackFullPluginInstallActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpackplugininstall/fullplugin/install/JetpackFullPluginInstallActivity.kt
@@ -42,6 +42,7 @@ class JetpackFullPluginInstallActivity : AppCompatActivity() {
         observeActionEvents()
     }
 
+    @Suppress("OVERRIDE_DEPRECATION")
     override fun onBackPressed() {
         if (!viewModel.uiState.value.showCloseButton) return
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailListFragment.kt
@@ -106,7 +106,7 @@ class NotificationsDetailListFragment : ListFragment(), NotificationFragment {
         return view
     }
 
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")
     override fun onActivityCreated(bundle: Bundle?) {
         super.onActivityCreated(bundle)
         val listView = listView
@@ -455,6 +455,7 @@ class NotificationsDetailListFragment : ListFragment(), NotificationFragment {
             return pingbackUrl
         }
 
+        @Suppress("OVERRIDE_DEPRECATION")
         override fun doInBackground(vararg params: Void): List<NoteBlock>? {
             if (notification == null) {
                 return null
@@ -519,6 +520,7 @@ class NotificationsDetailListFragment : ListFragment(), NotificationFragment {
             )
         }
 
+        @Suppress("OVERRIDE_DEPRECATION")
         override fun onPostExecute(noteList: List<NoteBlock>?) {
             if (!isAdded || noteList == null) {
                 return
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.kt
@@ -84,7 +84,7 @@ class NotificationsListFragment : Fragment(R.layout.notifications_list_fragment)
     private var lastTabPosition = 0
     private var binding: NotificationsListFragmentBinding? = null
 
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         if (savedInstanceState != null) {
@@ -278,17 +278,20 @@ class NotificationsListFragment : Fragment(R.layout.notifications_list_fragment)
         }
     }
 
+    @Suppress("OVERRIDE_DEPRECATION")
     override fun onPrepareOptionsMenu(menu: Menu) {
         val notificationSettings = menu.findItem(R.id.notifications_settings)
         notificationSettings.isVisible = accountStore.hasAccessToken()
         super.onPrepareOptionsMenu(menu)
     }
 
+    @Suppress("OVERRIDE_DEPRECATION")
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(R.menu.notifications_list_menu, menu)
         super.onCreateOptionsMenu(menu, inflater)
     }
 
+    @Suppress("OVERRIDE_DEPRECATION")
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == R.id.notifications_settings) {
             ActivityLauncher.viewNotificationsSettings(activity)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragmentPage.kt b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragmentPage.kt
@@ -84,7 +84,7 @@ class NotificationsListFragmentPage : ViewPagerFragment(R.layout.notifications_l
         fun onClickNote(noteId: String?)
     }
 
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         val adapter = createOrGetNotesAdapter()
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt
@@ -558,6 +558,7 @@ class PagesFragment : Fragment(R.layout.pages_fragment), ScrollableViewInitializ
         )
     }
 
+    @Suppress("OVERRIDE_DEPRECATION")
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
         inflater.inflate(R.menu.menu_search, menu)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/PreferenceFragmentLifeCycleOwner.kt b/WordPress/src/main/java/org/wordpress/android/ui/prefs/PreferenceFragmentLifeCycleOwner.kt
@@ -30,27 +30,32 @@ open class PreferenceFragmentLifeCycleOwner : PreferenceFragment(), LifecycleOwn
     val lifecycleScope: LifecycleCoroutineScope
         get() = lifecycle.coroutineScope
 
+    @Suppress("OVERRIDE_DEPRECATION")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         lifecycleRegistry = LifecycleRegistry(this)
         lifecycleRegistry.handleLifecycleEvent(ON_CREATE)
     }
 
+    @Suppress("OVERRIDE_DEPRECATION")
     override fun onStart() {
         super.onStart()
         lifecycleRegistry.handleLifecycleEvent(ON_START)
     }
 
+    @Suppress("OVERRIDE_DEPRECATION")
     override fun onPause() {
         super.onPause()
         lifecycleRegistry.handleLifecycleEvent(ON_PAUSE)
     }
 
+    @Suppress("OVERRIDE_DEPRECATION")
     override fun onStop() {
         super.onStop()
         lifecycleRegistry.handleLifecycleEvent(ON_STOP)
     }
 
+    @Suppress("OVERRIDE_DEPRECATION")
     override fun onDestroy() {
         super.onDestroy()
         lifecycleRegistry.handleLifecycleEvent(ON_DESTROY)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/categories/detail/CategoryDetailFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/prefs/categories/detail/CategoryDetailFragment.kt
@@ -173,17 +173,20 @@ class CategoryDetailFragment : Fragment(R.layout.category_detail_fragment) {
         categoryAdapter.replaceItems(categoryLevels)
     }
 
+    @Suppress("OVERRIDE_DEPRECATION")
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         menu.clear()
         inflater.inflate(R.menu.tag_detail, menu)
         super.onCreateOptionsMenu(menu, inflater)
     }
 
+    @Suppress("OVERRIDE_DEPRECATION")
     override fun onPrepareOptionsMenu(menu: Menu) {
         super.onPrepareOptionsMenu(menu)
         menu.findItem(R.id.menu_trash).isVisible = isInEditMode
     }
 
+    @Suppress("OVERRIDE_DEPRECATION")
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == R.id.menu_trash) {
             confirmDeleteCategory()
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.kt
@@ -35,6 +35,7 @@ import androidx.core.view.MenuProvider
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.ViewModelProvider
@@ -864,7 +865,7 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
             is ReaderNavigationEvents.ReplaceRelatedPostDetailsWithHistory ->
                 replaceRelatedPostDetailWithHistory(postId = this.postId, blogId = this.blogId)
 
-            is ReaderNavigationEvents.ShowPostInWebView -> showPostInWebView(post)
+            is ReaderNavigationEvents.ShowPostInWebView -> showPostInWebView(post, this@ReaderPostDetailFragment)
             is ReaderNavigationEvents.ShowEngagedPeopleList -> {
                 ActivityLauncher.viewPostLikesListActivity(
                     activity,
@@ -1505,14 +1506,14 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
     }
 
     @Suppress("DEPRECATION")
-    private fun ReaderPostDetailFragment.showPostInWebView(post: ReaderPost) {
+    private fun showPostInWebView(post: ReaderPost, fragment: Fragment) {
         readerWebView.setIsPrivatePost(post.isPrivate)
         readerWebView.setBlogSchemeIsHttps(UrlUtils.isHttps(post.blogUrl))
         renderer = ReaderPostRenderer(readerWebView, viewModel.post, readerCssProvider)
 
         // if the post is from private atomic site postpone render until we have a special access cookie
         if (post.isPrivateAtomic && privateAtomicCookie.isCookieRefreshRequired()) {
-            PrivateAtCookieRefreshProgressDialog.showIfNecessary(fragmentManager, this@ReaderPostDetailFragment)
+            PrivateAtCookieRefreshProgressDialog.showIfNecessary(fragmentManager, fragment)
             requestPrivateAtomicCookie()
         } else if (post.isPrivateAtomic && privateAtomicCookie.exists()) {
             // make sure we add cookie to the cookie manager if it exists before starting render
@@ -1755,6 +1756,7 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         trackRelatedPostsIfShowing()
     }
 
+    @Suppress("SameParameterValue")
     private fun setRefreshing(refreshing: Boolean) {
         swipeToRefreshHelper.isRefreshing = refreshing
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllFragment.kt
@@ -147,7 +147,7 @@ class StatsViewAllFragment : Fragment(R.layout.stats_view_all_fragment) {
         binding = null
     }
 
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/LargeValueFormatter.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/LargeValueFormatter.kt
@@ -17,6 +17,7 @@ class LargeValueFormatter : ValueFormatter() {
     private var mMaxLength = 5
     private val mFormat: DecimalFormat = DecimalFormat("###E00", DecimalFormatSymbols(Locale.US))
 
+    @Suppress("OVERRIDE_DEPRECATION")
     override fun getFormattedValue(
         value: Float,
         entry: Entry,
diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/AppRatingDialog.kt b/WordPress/src/main/java/org/wordpress/android/widgets/AppRatingDialog.kt
@@ -125,7 +125,7 @@ object AppRatingDialog {
             internal const val TAG_APP_RATING_PROMPT_DIALOG = "TAG_APP_RATING_PROMPT_DIALOG"
         }
 
-        @Suppress("SwallowedException")
+        @Suppress("SwallowedException", "OVERRIDE_DEPRECATION")
         override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
             val builder = MaterialAlertDialogBuilder(activity)
             val appName = getString(R.string.app_name)
@@ -166,6 +166,7 @@ object AppRatingDialog {
             return builder.create()
         }
 
+        @Suppress("OVERRIDE_DEPRECATION")
         override fun onCancel(dialog: DialogInterface?) {
             super.onCancel(dialog)
             clearSharedPreferences()
diff --git a/build.gradle b/build.gradle
@@ -37,7 +37,7 @@ ext {
     androidxAppcompatVersion = '1.4.2'
     androidxArchCoreVersion = '2.1.0'
     androidxComposeVersion = '1.1.1'
-    androidxComposeCompilerVersion = '1.1.1'
+    androidxComposeCompilerVersion = '1.3.2'
     androidxComposeLifecycleVersion = '2.5.1'
     androidxCardviewVersion = '1.0.0'
     androidxConstraintlayoutVersion = '1.1.3'
diff --git a/settings.gradle b/settings.gradle
@@ -1,5 +1,5 @@
 pluginManagement {
-    gradle.ext.kotlinVersion = '1.6.10'
+    gradle.ext.kotlinVersion = '1.7.20'
     gradle.ext.agpVersion = '7.2.1'
     gradle.ext.daggerVersion = "2.42"
     gradle.ext.detektVersion = '1.21.0'

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ class ActivityLogListFragment : Fragment(R.layout.activity_log_list_fragment) {`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`
`117`		`- @Suppress("DEPRECATION")`
	`117`	`+ @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")`
`118`	`118`	`override fun onActivityCreated(savedInstanceState: Bundle?) {`
`119`	`119`	`super.onActivityCreated(savedInstanceState)`
`120`	`120`	`with(requireActivity()) {`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ class ThreatDetailsFragment : Fragment(R.layout.threat_details_fragment) {`
`124`	`124`	`threatActionDialog?.show()`
`125`	`125`	`}`
`126`	`126`
`127`		`- @Suppress("DEPRECATION")`
	`127`	`+ @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")`
`128`	`128`	`override fun onActivityCreated(savedInstanceState: Bundle?) {`
`129`	`129`	`super.onActivityCreated(savedInstanceState)`
`130`	`130`	`if (requireActivity().intent.extras?.containsKey(WordPress.SITE) != true) {`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ class JetpackFullPluginInstallActivity : AppCompatActivity() {`
`42`	`42`	`observeActionEvents()`
`43`	`43`	`}`
`44`	`44`
	`45`	`+ @Suppress("OVERRIDE_DEPRECATION")`
`45`	`46`	`override fun onBackPressed() {`
`46`	`47`	`if (!viewModel.uiState.value.showCloseButton) return`
`47`	`48`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ class NotificationsDetailListFragment : ListFragment(), NotificationFragment {`
`106`	`106`	`return view`
`107`	`107`	`}`
`108`	`108`
`109`		`- @Suppress("DEPRECATION")`
	`109`	`+ @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")`
`110`	`110`	`override fun onActivityCreated(bundle: Bundle?) {`
`111`	`111`	`super.onActivityCreated(bundle)`
`112`	`112`	`val listView = listView`
`@@ -455,6 +455,7 @@ class NotificationsDetailListFragment : ListFragment(), NotificationFragment {`
`455`	`455`	`return pingbackUrl`
`456`	`456`	`}`
`457`	`457`
	`458`	`+ @Suppress("OVERRIDE_DEPRECATION")`
`458`	`459`	`override fun doInBackground(vararg params: Void): List<NoteBlock>? {`
`459`	`460`	`if (notification == null) {`
`460`	`461`	`return null`
`@@ -519,6 +520,7 @@ class NotificationsDetailListFragment : ListFragment(), NotificationFragment {`
`519`	`520`	`)`
`520`	`521`	`}`
`521`	`522`
	`523`	`+ @Suppress("OVERRIDE_DEPRECATION")`
`522`	`524`	`override fun onPostExecute(noteList: List<NoteBlock>?) {`
`523`	`525`	`if (!isAdded \|\| noteList == null) {`
`524`	`526`	`return`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ class NotificationsListFragmentPage : ViewPagerFragment(R.layout.notifications_l`
`84`	`84`	`fun onClickNote(noteId: String?)`
`85`	`85`	`}`
`86`	`86`
`87`		`- @Suppress("DEPRECATION")`
	`87`	`+ @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")`
`88`	`88`	`override fun onActivityCreated(savedInstanceState: Bundle?) {`
`89`	`89`	`super.onActivityCreated(savedInstanceState)`
`90`	`90`	`val adapter = createOrGetNotesAdapter()`
Original file line number	Diff line number	Diff line change
`@@ -558,6 +558,7 @@ class PagesFragment : Fragment(R.layout.pages_fragment), ScrollableViewInitializ`
`558`	`558`	`)`
`559`	`559`	`}`
`560`	`560`
	`561`	`+ @Suppress("OVERRIDE_DEPRECATION")`
`561`	`562`	`override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {`
`562`	`563`	`super.onCreateOptionsMenu(menu, inflater)`
`563`	`564`	`inflater.inflate(R.menu.menu_search, menu)`
Original file line number	Diff line number	Diff line change
`@@ -173,17 +173,20 @@ class CategoryDetailFragment : Fragment(R.layout.category_detail_fragment) {`
`173`	`173`	`categoryAdapter.replaceItems(categoryLevels)`
`174`	`174`	`}`
`175`	`175`
	`176`	`+ @Suppress("OVERRIDE_DEPRECATION")`
`176`	`177`	`override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {`
`177`	`178`	`menu.clear()`
`178`	`179`	`inflater.inflate(R.menu.tag_detail, menu)`
`179`	`180`	`super.onCreateOptionsMenu(menu, inflater)`
`180`	`181`	`}`
`181`	`182`
	`183`	`+ @Suppress("OVERRIDE_DEPRECATION")`
`182`	`184`	`override fun onPrepareOptionsMenu(menu: Menu) {`
`183`	`185`	`super.onPrepareOptionsMenu(menu)`
`184`	`186`	`menu.findItem(R.id.menu_trash).isVisible = isInEditMode`
`185`	`187`	`}`
`186`	`188`
	`189`	`+ @Suppress("OVERRIDE_DEPRECATION")`
`187`	`190`	`override fun onOptionsItemSelected(item: MenuItem): Boolean {`
`188`	`191`	`if (item.itemId == R.id.menu_trash) {`
`189`	`192`	`confirmDeleteCategory()`