[Deps] Update Kotlin to 2.0.21

.gitignore

@@ -110,3 +110,6 @@ local-builds.gradle
 # gitignore for retrocompatibility, so that it won't appear as a new file and
 # be accidentally checked in the repository.
 google-upload-credentials.json
+
+# Kotlin
+.kotlin/

WooCommerce-Wear/build.gradle

@@ -1,8 +1,10 @@
 import io.sentry.android.gradle.extensions.InstrumentationFeature
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.google.dagger.hilt)
     alias(libs.plugins.ksp)
@@ -77,19 +79,13 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
+        sourceCompatibility JvmTarget.fromTarget(libs.versions.java.get()).target
+        targetCompatibility JvmTarget.fromTarget(libs.versions.java.get()).target
     }
     buildFeatures {
         buildConfig true
         compose true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.androidx.compose.compiler.get()
-    }
     packaging {
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'

WooCommerce/build.gradle

@@ -1,8 +1,10 @@
 import io.sentry.android.gradle.extensions.InstrumentationFeature
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlin.parcelize)
     alias(libs.plugins.google.dagger.hilt)
     alias(libs.plugins.sentry)
@@ -145,15 +147,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JvmTarget.fromTarget(libs.versions.java.get()).target
+        targetCompatibility JvmTarget.fromTarget(libs.versions.java.get()).target
         coreLibraryDesugaringEnabled true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.androidx.compose.compiler.get()
-    }
-
     flavorDimensions "buildType"
 
     productFlavors {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginWhatIsJetpackDialogFragment.kt

@@ -18,6 +18,7 @@ class LoginWhatIsJetpackDialogFragment : DialogFragment() {
         const val TAG = "LoginWhatIsJetpackDialogFragment"
     }
 
+    @Deprecated("Deprecated in Java")
     @Suppress("DEPRECATION")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt

@@ -435,6 +435,7 @@ class MainActivity :
         }
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
         AnalyticsTracker.trackBackPressed(this)
 
@@ -1231,6 +1232,7 @@ class MainActivity :
         )
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onAttachFragment(fragment: Fragment) {
         super.onAttachFragment(fragment)
         updateAppBarVisibility(fragment)

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/shippinglabels/PrintShippingLabelFragment.kt

@@ -67,6 +67,7 @@ class PrintShippingLabelFragment : BaseFragment(R.layout.fragment_print_shipping
     private fun setupToolbar(binding: FragmentPrintShippingLabelBinding) {
         binding.toolbar.title = getString(viewModel.screenTitle)
         binding.toolbar.setNavigationOnClickListener {
+            @Suppress("DEPRECATION")
             when {
                 requireContext().windowSizeClass != WindowSizeClass.Compact && onRequestAllowBackPress() -> {
                     findNavController().navigateUp()

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/categories/ParentCategoryListFragment.kt

@@ -60,6 +60,7 @@ class ParentCategoryListFragment :
         viewModel.fetchParentCategories()
     }
 
+    @Deprecated("Deprecated in Java")
     @Suppress("DEPRECATION")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/categories/ProductCategoriesFragment.kt

@@ -133,6 +133,7 @@ class ProductCategoriesFragment :
         })
     }
 
+    @Deprecated("Deprecated in Java")
     @Suppress("DEPRECATION")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/list/ProductListAdapter.kt

@@ -15,7 +15,7 @@ import com.woocommerce.android.util.CurrencyFormatter
 typealias OnProductClickListener = (remoteProductId: Long, sharedView: View?) -> Unit
 
 class ProductListAdapter(
-    private inline val clickListener: OnProductClickListener? = null,
+    private val clickListener: OnProductClickListener? = null,
     private val loadMoreListener: OnLoadMoreListener,
     private val currencyFormatter: CurrencyFormatter,
     private val isProductHighlighted: (Long) -> Boolean,

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/products/variations/attributes/AttributeBaseAdapter.kt

@@ -7,7 +7,7 @@ import com.woocommerce.android.databinding.AttributeItemBinding
 import com.woocommerce.android.model.ProductAttribute
 
 abstract class AttributeBaseAdapter<T : AttributeBaseAdapter.AttributeBaseViewHolder>(
-    private inline val onItemClick: (attributeId: Long, attributeName: String) -> Unit
+    private val onItemClick: (attributeId: Long, attributeName: String) -> Unit
 ) : RecyclerView.Adapter<T>() {
     private var attributeList = listOf<ProductAttribute>()
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/reviews/ReviewDetailFragment.kt

@@ -81,6 +81,7 @@ class ReviewDetailFragment :
         return inflater.inflate(R.layout.fragment_review_detail, container, false)
     }
 
+    @Deprecated("Deprecated in Java")
     @Suppress("DEPRECATION")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/reviews/ReviewModeration.kt

@@ -4,8 +4,7 @@ import com.woocommerce.android.model.ActionStatus
 import com.woocommerce.android.model.ActionStatus.PENDING
 import com.woocommerce.android.model.ProductReview
 
-@Suppress("DataClassPrivateConstructor")
-data class ReviewModerationRequest private constructor(
+data class ReviewModerationRequest(
     val review: ProductReview,
     val newStatus: ProductReviewStatus,
     private val timeOfRequest: Long

WooCommerce/src/main/kotlin/com/woocommerce/android/widgets/ItemDecorators.kt

@@ -23,6 +23,7 @@ class GridItemDecoration(
 }
 
 class HorizontalItemDecoration(private val spacing: Int) : ItemDecoration() {
+    @Deprecated("Deprecated in Java")
     override fun getItemOffsets(outRect: Rect, itemPosition: Int, parent: RecyclerView) {
         outRect.left = spacing
         outRect.right = spacing

WooCommerce/src/test/kotlin/com/woocommerce/android/ui/analytics/UpdateAnalyticsHubStatsTest.kt

@@ -383,6 +383,10 @@ internal class UpdateAnalyticsHubStatsTest : BaseUnitTest() {
 
     @Test
     fun `when data store allows new stats fetch, then request data with ForceNew strategy`() = testBlocking {
+        // Given
+        whenever(repository.fetchVisitorsData(testRangeSelection, ForceNew))
+            .doReturn(testVisitorsResult)
+
         // When
         sut(testRangeSelection, this)
 
@@ -409,6 +413,8 @@ internal class UpdateAnalyticsHubStatsTest : BaseUnitTest() {
             analyticsUpdateDataStore = analyticsDataStore,
             analyticsRepository = repository
         )
+        whenever(repository.fetchVisitorsData(testRangeSelection, Saved))
+            .doReturn(testVisitorsResult)
 
         // When
         sut(testRangeSelection, this)
@@ -437,6 +443,8 @@ internal class UpdateAnalyticsHubStatsTest : BaseUnitTest() {
                 analyticsUpdateDataStore = analyticsDataStore,
                 analyticsRepository = repository
             )
+            whenever(repository.fetchVisitorsData(testCustomRangeSelection, Saved))
+                .doReturn(testVisitorsResult)
 
             // When
             sut(testCustomRangeSelection, this)
@@ -457,6 +465,8 @@ internal class UpdateAnalyticsHubStatsTest : BaseUnitTest() {
                 analyticsUpdateDataStore = analyticsDataStore,
                 analyticsRepository = repository
             )
+            whenever(repository.fetchVisitorsData(testRangeSelection, ForceNew))
+                .doReturn(testVisitorsResult)
 
             // When
             sut(testRangeSelection, this, true)
@@ -490,6 +500,8 @@ internal class UpdateAnalyticsHubStatsTest : BaseUnitTest() {
             analyticsUpdateDataStore = analyticsDataStore,
             analyticsRepository = repository
         )
+        whenever(repository.fetchVisitorsData(testRangeSelection, Saved))
+            .doReturn(testVisitorsResult)
 
         // When
         sut(testRangeSelection, this, false)
@@ -539,6 +551,8 @@ internal class UpdateAnalyticsHubStatsTest : BaseUnitTest() {
             analyticsUpdateDataStore = analyticsDataStore,
             analyticsRepository = repository
         )
+        whenever(repository.fetchVisitorsData(eq(testRangeSelection), any()))
+            .doReturn(testVisitorsResult)
 
         // When
         sut(testRangeSelection, this)

build.gradle

@@ -1,5 +1,6 @@
 import com.automattic.android.measure.MeasureBuildsExtension
 import io.gitlab.arturbosch.detekt.Detekt
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -10,6 +11,7 @@ plugins {
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.android.test) apply false
     alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.kotlin.compose).apply(false)
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.google.dagger.hilt) apply false
     alias(libs.plugins.androidx.navigation.safeargs) apply false
@@ -34,7 +36,7 @@ allprojects {
 
     tasks.withType(KotlinCompile).all {
         kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_1_8
+            jvmTarget = JvmTarget.fromTarget(libs.versions.java.get()).target
             allWarningsAsErrors = true
             freeCompilerArgs += [
                     "-opt-in=kotlin.RequiresOptIn",

gradle/libs.versions.toml

@@ -10,7 +10,6 @@ androidx-browser = '1.5.0'
 androidx-camera = '1.2.3'
 androidx-cardview = '1.0.0'
 androidx-compose-bom = '2024.04.00'
-androidx-compose-compiler = '1.5.9'
 androidx-constraintlayout-compose = '1.0.1'
 androidx-constraintlayout-main = '2.1.4'
 androidx-core-main = '1.13.1'
@@ -70,12 +69,13 @@ google-services = '4.4.0'
 google-zxing = '3.5.3'
 gravatar = '0.2.0'
 jackson-databind = '2.12.7.1'
+java = '11'
 jetty-webapp = '9.4.51.v20230217'
 json-path = '2.9.0'
 junit = '4.13.2'
-kotlin = '1.9.22'
+kotlin = '2.0.21'
 kotlinx-coroutines = '1.8.1'
-ksp = '1.9.22-1.0.17'
+ksp = '2.0.21-1.0.27'
 mockito-inline = '4.6.1'
 mockito-kotlin = '4.0.0'
 mpandroidchart = 'v3.1.0'
@@ -246,6 +246,7 @@ google-dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "goo
 google-protobuf = { id = "com.google.protobuf", version.ref = "google-protobuf-plugin" }
 google-services = { id = "com.google.gms.google-services", version.ref = "google-services" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 sentry = { id = "io.sentry.android.gradle", version.ref = "sentry" }

libs/cardreader/build.gradle

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -21,8 +23,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JvmTarget.fromTarget(libs.versions.java.get()).target
+        targetCompatibility JvmTarget.fromTarget(libs.versions.java.get()).target
     }
 }
 

libs/commons/build.gradle

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -13,10 +15,7 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
+        sourceCompatibility JvmTarget.fromTarget(libs.versions.java.get()).target
+        targetCompatibility JvmTarget.fromTarget(libs.versions.java.get()).target
     }
 }

libs/iap/build.gradle

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -20,8 +22,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JvmTarget.fromTarget(libs.versions.java.get()).target
+        targetCompatibility JvmTarget.fromTarget(libs.versions.java.get()).target
     }
 }
 

quicklogin/build.gradle

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.test)
     alias(libs.plugins.kotlin.android)
@@ -66,8 +68,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JvmTarget.fromTarget(libs.versions.java.get()).target
+        targetCompatibility JvmTarget.fromTarget(libs.versions.java.get()).target
     }
 
     buildFeatures {